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

chromeos/login/login_state.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 CHROMEOS_LOGIN_LOGIN_STATE_H_
 #define CHROMEOS_LOGIN_LOGIN_STATE_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "chromeos/chromeos_export.h"
@@ skipping 15 matching lines @@
     LOGGED_IN_USER_OWNER,            // The owner of the device is logged in
     LOGGED_IN_USER_GUEST,            // A guest is logged in (i.e. incognito)
     LOGGED_IN_USER_RETAIL_MODE,      // Is in retail mode
     LOGGED_IN_USER_PUBLIC_ACCOUNT,   // A public account is logged in
     LOGGED_IN_USER_LOCALLY_MANAGED,  // A locally managed user is logged in
     LOGGED_IN_USER_KIOSK_APP         // Is in kiosk app mode
   };
 
   class Observer {
    public:
-    // Called when the login state changes.
+    // Called when either the login state or the logged in user type changes.
     virtual void LoggedInStateChanged(LoggedInState state) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   // Manage singleton instance.
   static void Initialize();
   static void Shutdown();
   static LoginState* Get();
@@ skipping 32 matching lines @@
   LoggedInState logged_in_state_;
   LoggedInUserType logged_in_user_type_;
   ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_LOGIN_LOGIN_STATE_H_