Base infrastructure for Networking Private API on Windows and Mac.

chrome/browser/extensions/api/networking_private/networking_private_event_router.h

Index: chrome/browser/extensions/api/networking_private/networking_private_event_router.h
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router.h b/chrome/browser/extensions/api/networking_private/networking_private_event_router.h
index 011c8ddf6a8fcd91a6c37ebfd9635d7b44c6467f..abc8885300a67edd699ed39e156cf1ac5e36433c 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router.h
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router.h
@@ -11,14 +11,17 @@
 
 class Profile;
 
-namespace chromeos {
+namespace extensions {
 
 // This is a factory class used by the BrowserContextDependencyManager
 // to instantiate the event router that will forward events
 // from the NetworkStateHandler to the JavaScript Networking API.
-class NetworkingPrivateEventRouter : public BrowserContextKeyedService,
-                                     public extensions::EventRouter::Observer,
-                                     public NetworkStateHandlerObserver {
+class NetworkingPrivateEventRouter
+    : public BrowserContextKeyedService,
+#ifdef OS_CHROMEOS

[tbarzic, 2013/10/03 20:19:00]

#if defined(OS_CHROMEOS)

[mef, 2013/10/08 21:46:26]

Done. Re-factored out.

+      public chromeos::NetworkStateHandlerObserver,
+#endif
+      public extensions::EventRouter::Observer {
  public:
   explicit NetworkingPrivateEventRouter(Profile* profile);
   virtual ~NetworkingPrivateEventRouter();
@@ -33,9 +36,12 @@ class NetworkingPrivateEventRouter : public BrowserContextKeyedService,
   virtual void OnListenerRemoved(
       const extensions::EventListenerInfo& details) OVERRIDE;
 
+#ifdef OS_CHROMEOS
   // NetworkStateHandlerObserver overrides:
   virtual void NetworkListChanged() OVERRIDE;
-  virtual void NetworkPropertiesUpdated(const NetworkState* network) OVERRIDE;
+  virtual void NetworkPropertiesUpdated(
+      const chromeos::NetworkState* network) OVERRIDE;
+#endif
 
  private:
   // Decide if we should listen for network changes or not. If there are any
@@ -50,7 +56,7 @@ class NetworkingPrivateEventRouter : public BrowserContextKeyedService,
   DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateEventRouter);
 };
 
-}  // namespace chromeos
+}  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_EVENT_ROUTER_H_