Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 335413002: Logic fix for switching to Reset screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check for default_host added. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 1110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1121 1121
1122 if (delegate_ && !ScreenLocker::default_screen_locker() && 1122 if (delegate_ && !ScreenLocker::default_screen_locker() &&
1123 !chromeos::IsMachineHWIDCorrect() && 1123 !chromeos::IsMachineHWIDCorrect() &&
1124 !oobe_ui_) { 1124 !oobe_ui_) {
1125 delegate_->ShowWrongHWIDScreen(); 1125 delegate_->ShowWrongHWIDScreen();
1126 return; 1126 return;
1127 } 1127 }
1128 1128
1129 PrefService* prefs = g_browser_process->local_state(); 1129 PrefService* prefs = g_browser_process->local_state();
1130 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { 1130 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
1131 if (core_oobe_actor_) 1131 if (core_oobe_actor_) {
1132 core_oobe_actor_->ShowDeviceResetScreen(); 1132 core_oobe_actor_->ShowDeviceResetScreen();
1133 return; 1133 return;
1134 }
1134 } 1135 }
1135 1136
1136 is_account_picker_showing_first_time_ = true; 1137 is_account_picker_showing_first_time_ = true;
1137 gaia_screen_handler_->MaybePreloadAuthExtension(); 1138 gaia_screen_handler_->MaybePreloadAuthExtension();
1138 1139
1139 if (ScreenLocker::default_screen_locker()) { 1140 if (ScreenLocker::default_screen_locker()) {
1140 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady(); 1141 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady();
1141 ScreenlockBridge::Get()->SetLockHandler(this); 1142 ScreenlockBridge::Get()->SetLockHandler(this);
1142 } 1143 }
1143 1144
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 return gaia_screen_handler_->frame_error(); 1385 return gaia_screen_handler_->frame_error();
1385 } 1386 }
1386 1387
1387 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1388 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1388 caps_lock_enabled_ = enabled; 1389 caps_lock_enabled_ = enabled;
1389 if (page_is_ready()) 1390 if (page_is_ready())
1390 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1391 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1391 } 1392 }
1392 1393
1393 } // namespace chromeos 1394 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698