Base infrastructure for Networking Private API on Windows and Mac.

chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc

Index: chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
index c431c7fbd7881d9449939af369754f7d35f6d5fa..90c3f3dbd3b508ac76259c3cf9d5999c3470b684 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
@@ -23,9 +23,8 @@
 
 using extensions::EventRouter;
 using extensions::ExtensionSystem;
-namespace api = extensions::api::networking_private;
 
-namespace chromeos {
+namespace extensions {
 
 NetworkingPrivateEventRouter::NetworkingPrivateEventRouter(Profile* profile)
     : profile_(profile), listening_(false) {
@@ -36,9 +35,11 @@ NetworkingPrivateEventRouter::NetworkingPrivateEventRouter(Profile* profile)
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
   if (event_router) {
     event_router->RegisterObserver(
-        this, api::OnNetworksChanged::kEventName);
+        this,
+        extensions::api::networking_private::OnNetworksChanged::kEventName);

[stevenjb, 2013/09/25 19:09:15]

extensions:: not needed, here and below

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

Done.

     event_router->RegisterObserver(
-        this, api::OnNetworkListChanged::kEventName);
+        this,
+        extensions::api::networking_private::OnNetworkListChanged::kEventName);
     StartOrStopListeningForNetworkChanges();
   }
 }
@@ -56,7 +57,7 @@ void NetworkingPrivateEventRouter::Shutdown() {
     event_router->UnregisterObserver(this);
 
   if (listening_) {
-    NetworkHandler::Get()->network_state_handler()->RemoveObserver(
+    chromeos::NetworkHandler::Get()->network_state_handler()->RemoveObserver(
         this, FROM_HERE);
   }
   listening_ = false;
@@ -78,14 +79,16 @@ void NetworkingPrivateEventRouter::OnListenerRemoved(
 void NetworkingPrivateEventRouter::StartOrStopListeningForNetworkChanges() {
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
   bool should_listen =
-      event_router->HasEventListener(api::OnNetworksChanged::kEventName) ||
-      event_router->HasEventListener(api::OnNetworkListChanged::kEventName);
+      event_router->HasEventListener(
+          extensions::api::networking_private::OnNetworksChanged::kEventName) ||
+      event_router->HasEventListener(extensions::api::networking_private::
+                                         OnNetworkListChanged::kEventName);
 
   if (should_listen && !listening_) {
-    NetworkHandler::Get()->network_state_handler()->AddObserver(
+    chromeos::NetworkHandler::Get()->network_state_handler()->AddObserver(
         this, FROM_HERE);
   } else if (!should_listen && listening_) {
-    NetworkHandler::Get()->network_state_handler()->RemoveObserver(
+    chromeos::NetworkHandler::Get()->network_state_handler()->RemoveObserver(
         this, FROM_HERE);
   }
   listening_ = should_listen;
@@ -93,9 +96,11 @@ void NetworkingPrivateEventRouter::StartOrStopListeningForNetworkChanges() {
 
 void NetworkingPrivateEventRouter::NetworkListChanged() {
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
-  NetworkStateHandler::NetworkStateList networks;
-  NetworkHandler::Get()->network_state_handler()->GetNetworkList(&networks);
-  if (!event_router->HasEventListener(api::OnNetworkListChanged::kEventName)) {
+  chromeos::NetworkStateHandler::NetworkStateList networks;
+  chromeos::NetworkHandler::Get()->network_state_handler()->GetNetworkList(
+      &networks);
+  if (!event_router->HasEventListener(extensions::api::networking_private::
+                                          OnNetworkListChanged::kEventName)) {
     // TODO(stevenjb): Remove logging once crbug.com/256881 is fixed
     // (or at least reduce to LOG_DEBUG). Same with NET_LOG events below.
     NET_LOG_EVENT("NetworkingPrivate.NetworkListChanged: No Listeners", "");
@@ -105,36 +110,43 @@ void NetworkingPrivateEventRouter::NetworkListChanged() {
   NET_LOG_EVENT("NetworkingPrivate.NetworkListChanged", "");
 
   std::vector<std::string> changes;
-  for (NetworkStateHandler::NetworkStateList::const_iterator iter =
-           networks.begin(); iter != networks.end(); ++iter) {
+  for (chromeos::NetworkStateHandler::NetworkStateList::const_iterator iter =
+           networks.begin();
+       iter != networks.end();
+       ++iter) {
     // TODO(gspencer): Currently the "GUID" is actually the service path. Fix
     // this to be the real GUID once we're using
     // ManagedNetworkConfigurationManager.
     changes.push_back((*iter)->path());
   }
 
-  scoped_ptr<base::ListValue> args(api::OnNetworkListChanged::Create(changes));
+  scoped_ptr<base::ListValue> args(
+      extensions::api::networking_private::OnNetworkListChanged::Create(
+          changes));
   scoped_ptr<extensions::Event> extension_event(new extensions::Event(
-      api::OnNetworkListChanged::kEventName, args.Pass()));
+      extensions::api::networking_private::OnNetworkListChanged::kEventName,
+      args.Pass()));
   event_router->BroadcastEvent(extension_event.Pass());
 }
 
 void NetworkingPrivateEventRouter::NetworkPropertiesUpdated(
-    const NetworkState* network) {
+    const chromeos::NetworkState* network) {
   EventRouter* event_router = ExtensionSystem::Get(profile_)->event_router();
-  if (!event_router->HasEventListener(api::OnNetworksChanged::kEventName)) {
+  if (!event_router->HasEventListener(extensions::api::networking_private::
+                                          OnNetworksChanged::kEventName)) {
     NET_LOG_EVENT("NetworkingPrivate.NetworkPropertiesUpdated: No Listeners",
                   network->path());
     return;
   }
   NET_LOG_EVENT("NetworkingPrivate.NetworkPropertiesUpdated",
                 network->path());
-  scoped_ptr<base::ListValue> args(api::OnNetworksChanged::Create(
-      std::vector<std::string>(1, network->path())));
-  scoped_ptr<extensions::Event> extension_event(
-      new extensions::Event(api::OnNetworksChanged::kEventName, args.Pass()));
+  scoped_ptr<base::ListValue> args(
+      extensions::api::networking_private::OnNetworksChanged::Create(
+          std::vector<std::string>(1, network->path())));
+  scoped_ptr<extensions::Event> extension_event(new extensions::Event(
+      extensions::api::networking_private::OnNetworksChanged::kEventName,
+      args.Pass()));
   event_router->BroadcastEvent(extension_event.Pass());
 }
 
-}  // namespace chromeos
-
+}  // namespace extensions