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

Side by Side Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.cc

Issue 324463003: ChromeOS login webui refactoring : Simplify login methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with ToT 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/lock/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/lock_state_controller.h" 8 #include "ash/wm/lock_state_controller.h"
9 #include "ash/wm/lock_state_observer.h" 9 #include "ash/wm/lock_state_observer.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 base::string16 WebUIScreenLocker::GetConnectedNetworkName() { 236 base::string16 WebUIScreenLocker::GetConnectedNetworkName() {
237 return network_state_helper_->GetCurrentNetworkName(); 237 return network_state_helper_->GetCurrentNetworkName();
238 } 238 }
239 239
240 bool WebUIScreenLocker::IsSigninInProgress() const { 240 bool WebUIScreenLocker::IsSigninInProgress() const {
241 // The way how screen locker is implemented right now there's no 241 // The way how screen locker is implemented right now there's no
242 // GAIA sign in in progress in any case. 242 // GAIA sign in in progress in any case.
243 return false; 243 return false;
244 } 244 }
245 245
246 void WebUIScreenLocker::Login(const UserContext& user_context) { 246 void WebUIScreenLocker::Login(const UserContext& user_context,
247 const SigninSpecifics& specifics) {
247 chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context); 248 chromeos::ScreenLocker::default_screen_locker()->Authenticate(user_context);
248 } 249 }
249 250
250 void WebUIScreenLocker::LoginAsRetailModeUser() {
251 NOTREACHED();
252 }
253
254 void WebUIScreenLocker::LoginAsGuest() {
255 NOTREACHED();
256 }
257
258 void WebUIScreenLocker::MigrateUserData(const std::string& old_password) { 251 void WebUIScreenLocker::MigrateUserData(const std::string& old_password) {
259 NOTREACHED(); 252 NOTREACHED();
260 } 253 }
261 254
262 void WebUIScreenLocker::LoginAsPublicAccount(const std::string& username) {
263 NOTREACHED();
264 }
265
266 void WebUIScreenLocker::OnSigninScreenReady() { 255 void WebUIScreenLocker::OnSigninScreenReady() {
267 } 256 }
268 257
269 void WebUIScreenLocker::OnUserSelected(const std::string& username) {
270 }
271
272 void WebUIScreenLocker::OnStartEnterpriseEnrollment() { 258 void WebUIScreenLocker::OnStartEnterpriseEnrollment() {
273 NOTREACHED(); 259 NOTREACHED();
274 } 260 }
275 261
276 void WebUIScreenLocker::OnStartKioskEnableScreen() { 262 void WebUIScreenLocker::OnStartKioskEnableScreen() {
277 NOTREACHED(); 263 NOTREACHED();
278 } 264 }
279 265
280 void WebUIScreenLocker::OnStartKioskAutolaunchScreen() { 266 void WebUIScreenLocker::OnStartKioskAutolaunchScreen() {
281 NOTREACHED(); 267 NOTREACHED();
(...skipping 11 matching lines...) Expand all
293 } 279 }
294 280
295 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) { 281 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) {
296 NOTREACHED(); 282 NOTREACHED();
297 } 283 }
298 284
299 void WebUIScreenLocker::Signout() { 285 void WebUIScreenLocker::Signout() {
300 chromeos::ScreenLocker::default_screen_locker()->Signout(); 286 chromeos::ScreenLocker::default_screen_locker()->Signout();
301 } 287 }
302 288
303 void WebUIScreenLocker::LoginAsKioskApp(const std::string& app_id,
304 bool diagnostic_mode) {
305 NOTREACHED();
306 }
307
308 //////////////////////////////////////////////////////////////////////////////// 289 ////////////////////////////////////////////////////////////////////////////////
309 // LockWindow::Observer implementation: 290 // LockWindow::Observer implementation:
310 291
311 void WebUIScreenLocker::OnLockWindowReady() { 292 void WebUIScreenLocker::OnLockWindowReady() {
312 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not"); 293 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not");
313 lock_ready_ = true; 294 lock_ready_ = true;
314 if (webui_ready_) 295 if (webui_ready_)
315 ScreenLockReady(); 296 ScreenLockReady();
316 } 297 }
317 298
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false); 378 GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
398 if (login::LoginScrollIntoViewEnabled()) 379 if (login::LoginScrollIntoViewEnabled())
399 GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true, new_bounds); 380 GetOobeUI()->GetCoreOobeActor()->SetKeyboardState(true, new_bounds);
400 } 381 }
401 } 382 }
402 383
403 keyboard_bounds_ = new_bounds; 384 keyboard_bounds_ = new_bounds;
404 } 385 }
405 386
406 } // namespace chromeos 387 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/webui_screen_locker.h ('k') | chrome/browser/chromeos/login/login_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698