Mac OS X-specific implementation of Networking Private API.

components/wifi/wifi_service.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_UTILITY_WIFI_WIFI_SERVICE_H_
 #define CHROME_UTILITY_WIFI_WIFI_SERVICE_H_
 
 #include <list>
+#include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "components/wifi/wifi_export.h"
 
 namespace wifi {
 
 // WiFiService interface used by implementation of chrome.networkingPrivate
 // JavaScript extension API. All methods should be called on worker thread.
 // It could be created on any (including UI) thread, so nothing expensive should
-// be done in the constructor.
+// be done in the constructor. See |NetworkingPrivateService| for wrapper
+// accessible on UI thread.
 class WIFI_EXPORT WiFiService {
  public:
   typedef std::vector<std::string> NetworkGuidList;
   typedef base::Callback<
       void(const NetworkGuidList& network_guid_list)> NetworkGuidListCallback;
 
   virtual ~WiFiService() {}
 
   // Initialize WiFiService, store |task_runner| for posting worker tasks.
   virtual void Initialize(
@@ skipping 63 matching lines @@
   virtual void StartDisconnect(const std::string& network_guid,
                                std::string* error) = 0;
 
   // Set observers to run when |NetworksChanged| and |NetworksListChanged|
   // events needs to be sent. Notifications are posted on |message_loop_proxy|.
   virtual void SetEventObservers(
       scoped_refptr<base::MessageLoopProxy> message_loop_proxy,
       const NetworkGuidListCallback& networks_changed_observer,
       const NetworkGuidListCallback& network_list_changed_observer) = 0;
 
+  // Request update of Connected Network information. Send |NetworksChanged|
+  // event on completion.
+  virtual void RequestConnectedNetworkUpdate() = 0;
+
  protected:
   WiFiService() {}
 
   typedef int32 Frequency;
   enum FrequencyEnum {
     kFrequencyAny = 0,
     kFrequencyUnknown = 0,
     kFrequency2400 = 2400,
     kFrequency5000 = 5000
   };
 
-  typedef std::list<Frequency> FrequencyList;
+  typedef std::set<Frequency> FrequencySet;
   // Network Properties, used as result of |GetProperties| and
   // |GetVisibleNetworks|.
   struct WIFI_EXPORT NetworkProperties {
     NetworkProperties();
     ~NetworkProperties();
 
     std::string connection_state;
     std::string guid;
     std::string name;
     std::string ssid;
     std::string bssid;
     std::string type;
     std::string security;
     // |password| field is used to pass wifi password for network creation via
     // |CreateNetwork| or connection via |StartConnect|. It does not persist
     // once operation is completed.
     std::string password;
     // WiFi Signal Strength. 0..100
     uint32 signal_strength;
     bool auto_connect;
     Frequency frequency;
-    FrequencyList frequency_list;
+    FrequencySet frequency_set;
 
     std::string json_extra;  // Extra JSON properties for unit tests
 
     scoped_ptr<base::DictionaryValue> ToValue(bool network_list) const;
     // Updates only properties set in |value|.
     bool UpdateFromValue(const base::DictionaryValue& value);
     static std::string MacAddressAsString(const uint8 mac_as_int[6]);
     static bool OrderByType(const NetworkProperties& l,
                             const NetworkProperties& r);
   };
 
   typedef std::list<NetworkProperties> NetworkList;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WiFiService);
 };
 
 }  // namespace wifi
 
 #endif  // CHROME_UTILITY_WIFI_WIFI_SERVICE_H_