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

chromeos/login/login_state.cc

 // 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.
 
 #include "chromeos/login/login_state.h"
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 41 matching lines @@
 void LoginState::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void LoginState::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void LoginState::SetLoggedInState(LoggedInState state,
                                   LoggedInUserType type) {
-  if (state == logged_in_state_)
+  if (state == logged_in_state_ && type == logged_in_user_type_)
     return;
   VLOG(1) << "LoggedInState: " << state << " UserType: " << type;
   logged_in_state_ = state;
   logged_in_user_type_ = type;
   NotifyObservers();
 }
 
 LoginState::LoggedInState LoginState::GetLoggedInState() const {
   if (AlwaysLoggedIn())
     return LOGGED_IN_ACTIVE;
@@ skipping 48 matching lines @@
 
 LoginState::~LoginState() {
 }
 
 void LoginState::NotifyObservers() {
   FOR_EACH_OBSERVER(LoginState::Observer, observer_list_,
                     LoggedInStateChanged(GetLoggedInState()));
 }
 
 }  // namespace chromeos