Merge 222390 "network_list.js should reflect the correct logged ..."

chrome/browser/ui/webui/options/chromeos/internet_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
+#include "chromeos/login/login_state.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/native_widget_types.h"
 
 class Browser;
 
 namespace chromeos {
 class DeviceState;
 class NetworkState;
 class NetworkStateHandlerObserver;
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace views {
 class WidgetDelegate;
 }
 
 namespace chromeos {
 namespace options {
 
 // ChromeOS internet options page UI handler.
 class InternetOptionsHandler
     : public ::options::OptionsPageUIHandler,
-      public chromeos::NetworkStateHandlerObserver {
+      public chromeos::NetworkStateHandlerObserver,
+      public chromeos::LoginState::Observer {
  public:
   InternetOptionsHandler();
   virtual ~InternetOptionsHandler();
 
  private:
   // OptionsPageUIHandler
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void InitializePage() OVERRIDE;
 
@@ skipping 33 matching lines @@
       const base::DictionaryValue& shill_properties);
   // Called when carrier data has been updated to informs the JS.
   void UpdateCarrier();
 
   // NetworkStateHandlerObserver
   virtual void NetworkManagerChanged() OVERRIDE;
   virtual void NetworkListChanged() OVERRIDE;
   virtual void NetworkPropertiesUpdated(
       const chromeos::NetworkState* network) OVERRIDE;
 
+  // chromeos::LoginState::Observer
+  virtual void LoggedInStateChanged(
+      chromeos::LoginState::LoggedInState) OVERRIDE;
+
+  // Updates the logged in user type.
+  void UpdateLoggedInUserType();
+
   // content::NotificationObserver (from OptionsPageUIHandler)
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Additional callbacks to set network state properties.
   void SetServerHostnameCallback(const base::ListValue* args);
   void SetPreferNetworkCallback(const base::ListValue* args);
   void SetAutoConnectCallback(const base::ListValue* args);
   void SetIPConfigCallback(const base::ListValue* args);
@@ skipping 45 matching lines @@
   // of this object.
   base::WeakPtrFactory<InternetOptionsHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InternetOptionsHandler);
 };
 
 }  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_INTERNET_OPTIONS_HANDLER_H_