WiFi client for GCD bootstrapping

chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h

Index: chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
new file mode 100644
index 0000000000000000000000000000000000000000..e28a0110682bb653bee85da1c6bd62971a620b81
--- /dev/null
+++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.h
@@ -0,0 +1,81 @@
+// Copyright 2014 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_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_
+#define CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_
+
+#include <string>
+#include <vector>
+
+#include "base/callback.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
+#include "chrome/browser/local_discovery/wifi/wifi_manager.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace local_discovery {
+
+namespace wifi {
+
+class WifiManagerNonChromeos : public WifiManager {
+ public:
+  WifiManagerNonChromeos();
+  virtual ~WifiManagerNonChromeos();
+
+  // WifiManager implementation.
+  virtual void Start() OVERRIDE;
+  virtual void GetSSIDList(const SSIDListCallback& callback) OVERRIDE;
+  virtual void RequestScan() OVERRIDE;
+  virtual void ConfigureAndConnectNetwork(
+      const std::string& ssid,
+      const WifiCredentials& credentials,
+      const SuccessCallback& callback) OVERRIDE;
+  virtual void ConnectToNetworkByID(const std::string& internal_id,
+                                    const SuccessCallback& callback) OVERRIDE;
+  virtual void RequestNetworkCredentials(
+      const std::string& internal_id,
+      const CredentialsCallback& callback) OVERRIDE;
+
+  // Add a network list observer. This observer will be notified every time the
+  // network list changes.

[stevenjb, 2014/05/27 16:49:08]

Add/RemoveNetworkListObserver are now part of the base class, so would be more
clear to group them with the other OVERRIDEs and rely on comments in the base
class. (i.e remove this comment and the next).

[Noam Samuel, 2014/05/27 22:24:08]

Done.

+  virtual void AddNetworkListObserver(NetworkListObserver* observer) OVERRIDE;
+
+  // Remove a network list observer.
+  virtual void RemoveNetworkListObserver(
+      NetworkListObserver* observer) OVERRIDE;
+
+ private:
+  class WifiServiceWrapper;
+
+  // Called when the network list changes. Used for NetworkListWatcher.

[stevenjb, 2014/05/27 16:49:08]

'Used by WifiServiceWrapper.'

[Noam Samuel, 2014/05/27 22:24:08]

Done.

+  void OnNetworkListChanged(
+      scoped_ptr<std::vector<NetworkProperties> > ssid_list);

[stevenjb, 2014/05/27 16:49:08]

nit: std::vector<NetworkProperties> is used enough that we should maybe typedef
it (e.g. NetworkPropertiesVector). It's not any shorter, but is a little easier
to read, especially with scoped_ptr<>.

[Noam Samuel, 2014/05/27 22:24:08]

Done.

+
+  // Used to post callbacks that take a const& network list without copying the
+  // vector between threads.
+  void PostSSIDListCallback(
+      const SSIDListCallback& callback,
+      scoped_ptr<std::vector<NetworkProperties> > ssid_list);
+
+  // Used to ensure closures posted from the wifi threads aren't called after
+  // the service client is deleted.
+  void PostClosure(const base::Closure& callback);
+
+  std::string original_guid_;
+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+  // Owned. Deleted on file thread.

[stevenjb, 2014/05/27 16:49:08]

nit: Put this comment after the variable, or a blank line above it to make it
clear what it refers to.

[Noam Samuel, 2014/05/27 22:24:08]

Done.

+  WifiServiceWrapper* wifi_wrapper_;
+  ObserverList<NetworkListObserver> network_list_observers_;
+
+  base::WeakPtrFactory<WifiManagerNonChromeos> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(WifiManagerNonChromeos);
+};
+
+}  // namespace wifi
+
+}  // namespace local_discovery
+
+#endif  // CHROME_BROWSER_LOCAL_DISCOVERY_WIFI_WIFI_MANAGER_NONCHROMEOS_H_