Eliminate NetworkManagerChanged

chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_ui.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 250 matching lines @@
       const std::string& error_name,
       scoped_ptr<base::DictionaryValue> error_data);
 
   // Handlers for JS WebUI messages.
   void HandleSetTransactionStatus(const ListValue* args);
   void HandleStartActivation(const ListValue* args);
   void HandlePaymentPortalLoad(const ListValue* args);
   void HandleGetDeviceInfo(const ListValue* args);
 
   // NetworkStateHandlerObserver implementation.
-  virtual void NetworkManagerChanged() OVERRIDE;
+  virtual void NetworkConnectionStateChanged(
+      const NetworkState* network) OVERRIDE;
   virtual void DefaultNetworkChanged(
       const NetworkState* default_network) OVERRIDE;
 
   // Updates |lte_portal_reachable_| for lte network |network| and notifies
   // webui of the new state if the reachability changed or |force_notification|
   // is set.
   void UpdatePortalReachability(const NetworkState* network,
                                 bool force_notification);
 
   // Sends message to host registration page with system/user info data.
@@ skipping 305 matching lines @@
     const std::string& callback_name,
     const std::string& error_name,
     scoped_ptr<base::DictionaryValue> error_data) {
   NET_LOG_ERROR("MobileActivator GetProperties Failed: " + error_name,
                 service_path);
   // Invoke |callback_name| with an empty dictionary.
   DictionaryValue device_dict;
   web_ui()->CallJavascriptFunction(callback_name, device_dict);
 }
 
-void MobileSetupHandler::NetworkManagerChanged() {
+void MobileSetupHandler::DefaultNetworkChanged(
+    const NetworkState* default_network) {
   if (!web_ui())
     return;
 
-  std::string path = web_ui()->GetWebContents()->GetURL().path();
+  std::string path = web_ui()->GetWebContents()->GetURL().path().substr(1);
   if (path.empty())
     return;
 
   const NetworkState* network =
-      NetworkHandler::Get()->network_state_handler()->GetNetworkState(
-          path.substr(1));
+      NetworkHandler::Get()->network_state_handler()->GetNetworkState(path);
   if (!network) {
     LOG(ERROR) << "Service path lost";
     web_ui()->GetWebContents()->Close();
     return;
   }
 
-  UpdatePortalReachability(network,
-                           false /* do not force notification */);
+  UpdatePortalReachability(network, false /* do not force notification */);
 }
 
-void MobileSetupHandler::DefaultNetworkChanged(
-    const NetworkState* default_network) {
-  NetworkManagerChanged();
+void MobileSetupHandler::NetworkConnectionStateChanged(
+    const NetworkState* network) {
+  if (!web_ui())
+    return;
+
+  std::string path = web_ui()->GetWebContents()->GetURL().path().substr(1);
+  if (path.empty() || path != network->path())
+    return;
+
+  UpdatePortalReachability(network, false /* do not force notification */);
 }
 
 void MobileSetupHandler::UpdatePortalReachability(
     const NetworkState* network,
     bool force_notification) {
   DCHECK(web_ui());
 
   DCHECK_EQ(type_, TYPE_PORTAL_LTE);
 
   chromeos::NetworkStateHandler* nsh =
@@ skipping 24 matching lines @@
 
   // Set up the chrome://mobilesetup/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::URLDataSource::Add(profile, html_source);
 }
 
 void MobileSetupUI::RenderViewCreated(RenderViewHost* host) {
   // Destroyed by the corresponding RenderViewHost
   new PortalFrameLoadObserver(AsWeakPtr(), host);
 }