commit b790aa2e5b6422cbba4a20be81ba1c0445701405
author Gaurav Shah <gauravsh@google.com> Tue Oct 23 12:51:12 2012 -0700
committer Gerrit <chrome-bot@google.com> Fri Oct 26 17:16:17 2012 -0700
tree bc8e87fa9fd1f75dd2991537f4e32cd20dce1c9d
parent c618448120f8945d77d451242a7de6782d1e4189

shill: Hook up manager dbus method to return the list of geolocation networks

BUG=chromium-os:34844
TEST=dbus-send --system --print-reply --fixed --dest=org.chromium.flimflam / \
        org.chromium.flimflam.Manager.GetNetworksForGeolocation

Change-Id: I5d4b932004677a54621494af87f94c50c38a858d
Reviewed-on: https://gerrit.chromium.org/gerrit/36524
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Gaurav Shah <gauravsh@chromium.org>
Tested-by: Gaurav Shah <gauravsh@chromium.org>

geolocation_info.h

diff --git a/geolocation_info.h b/geolocation_info.h
index 45307e0..20b9243 100644
--- a/geolocation_info.h
+++ b/geolocation_info.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
@@ -23,6 +24,11 @@
 
   void AddField(const std::string &key, const std::string &value);
   const std::string &GetFieldValue(const std::string &key) const;
+
+  const std::map<std::string, std::string> properties() const {
+    return properties_;
+  }
+
  private:
   FRIEND_TEST(WiFiMainTest, GetGeolocationObjects);
 
@@ -32,6 +38,8 @@
   std::map<std::string, std::string> properties_;
 };
 
+typedef std::vector<GeolocationInfo> GeolocationInfos;
+
 }  // namespace shill
 
 #endif  // SHILL_GEOLOCATION_INFO_