NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

 // Copyright (c) 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_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 161 matching lines @@
   void SetDelegate(SigninScreenHandlerDelegate* delegate);
 
   void SetNativeWindowDelegate(NativeWindowDelegate* native_window_delegate);
 
   // NetworkStateInformerDelegate implementation:
   virtual void OnNetworkReady() OVERRIDE;
 
   // NetworkStateInformer::NetworkStateInformerObserver implementation:
   virtual void UpdateState(NetworkStateInformer::State state,
                            const std::string& service_path,
-                           ConnectionType connection_type,
+                           const std::string& connection_type,
                            const std::string& reason) OVERRIDE;
 
  private:
   enum UIState {
     UI_STATE_UNKNOWN = 0,
     UI_STATE_GAIA_SIGNIN,
     UI_STATE_ACCOUNT_PICKER,
     UI_STATE_LOCALLY_MANAGED_USER_CREATION
   };
 
   typedef base::hash_set<std::string> WebUIObservers;
 
   friend class ReportDnsCacheClearedOnUIThread;
   friend class LocallyManagedUserCreationScreenHandler;
 
   // Updates current UI of the signin screen according to |ui_state|
   // argument.  Optionally it can pass screen initialization data via
   // |params| argument.
   void UpdateUIState(UIState ui_state, DictionaryValue* params);
 
   void UpdateStateInternal(NetworkStateInformer::State state,
-                           const std::string service_path,
-                           ConnectionType connection_type,
-                           std::string reason,
+                           const std::string& service_path,
+                           const std::string& connection_type,
+                           const std::string& reason,
                            bool force_update);
   void SetupAndShowOfflineMessage(NetworkStateInformer::State state,
                                   const std::string& service_path,
-                                  ConnectionType connection_type,
                                   const std::string& reason,
                                   bool is_proxy_error,
                                   bool is_under_captive_portal,
                                   bool is_gaia_loading_timeout);
   void HideOfflineMessage(NetworkStateInformer::State state,
                           const std::string& service_path,
                           const std::string& reason,
                           bool is_gaia_signin,
                           bool is_gaia_reloaded);
   void ReloadGaiaScreen();
@@ skipping 212 matching lines @@
 
   // Testing helper, specifies new value for gaia url.
   std::string gaia_origin_for_test_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_