summaryrefslogtreecommitdiffstats
path: root/chromeos/login/login_state.cc
diff options
context:
space:
mode:
authorarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-10 23:22:49 +0000
committerarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-10 23:22:49 +0000
commitab862306ca2fd7a95d139ae66a2cc1ee06f0211a (patch)
tree9723204bcee16a33bf58aca01866a4ce1f9f79a1 /chromeos/login/login_state.cc
parentbaed4d3ddf78ceb4661ed9414248dfd8baf1b8ab (diff)
downloadchromium_src-ab862306ca2fd7a95d139ae66a2cc1ee06f0211a.zip
chromium_src-ab862306ca2fd7a95d139ae66a2cc1ee06f0211a.tar.gz
chromium_src-ab862306ca2fd7a95d139ae66a2cc1ee06f0211a.tar.bz2
network_list.js should reflect the correct logged in user type.
Updated InternetOptionsHandler and network_list.js to observe LoginState updates, so that using UIAccountTweaks is not the only way to determine whether or not the current user is owner. This is because |loadTimeData| may not contain the current user login details if the logged in user type updates after the UI fills in the UIAccountTweaks info. BUG=285589 R=stevenjb@chromium.org Review URL: https://codereview.chromium.org/23466015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/login/login_state.cc')
-rw-r--r--chromeos/login/login_state.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/login/login_state.cc b/chromeos/login/login_state.cc
index de2715a..8c8c329 100644
--- a/chromeos/login/login_state.cc
+++ b/chromeos/login/login_state.cc
@@ -59,7 +59,7 @@ void LoginState::RemoveObserver(Observer* 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;