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

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

Issue 1494153002: This CL replaces e-mail with AccountId in easy signin code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bugfix in original easy unlock code' Created 5 years 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
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/system/chromeos/power/power_event_observer.h" 8 #include "ash/system/chromeos/power/power_event_observer.h"
9 #include "ash/wm/lock_state_controller.h" 9 #include "ash/wm/lock_state_controller.h"
10 #include "ash/wm/lock_state_observer.h" 10 #include "ash/wm/lock_state_observer.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 } 275 }
276 276
277 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) { 277 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) {
278 NOTREACHED(); 278 NOTREACHED();
279 } 279 }
280 280
281 void WebUIScreenLocker::Signout() { 281 void WebUIScreenLocker::Signout() {
282 chromeos::ScreenLocker::default_screen_locker()->Signout(); 282 chromeos::ScreenLocker::default_screen_locker()->Signout();
283 } 283 }
284 284
285 bool WebUIScreenLocker::IsUserWhitelisted(const std::string& user_id) { 285 bool WebUIScreenLocker::IsUserWhitelisted(const AccountId& account_id) {
286 NOTREACHED(); 286 NOTREACHED();
287 return true; 287 return true;
288 } 288 }
289 //////////////////////////////////////////////////////////////////////////////// 289 ////////////////////////////////////////////////////////////////////////////////
290 // LockWindow::Observer: 290 // LockWindow::Observer:
291 291
292 void WebUIScreenLocker::OnLockWindowReady() { 292 void WebUIScreenLocker::OnLockWindowReady() {
293 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not"); 293 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not");
294 lock_ready_ = true; 294 lock_ready_ = true;
295 if (webui_ready_) 295 if (webui_ready_)
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 404 }
405 405
406 if (GetOobeUI()) { 406 if (GetOobeUI()) {
407 const gfx::Size& size = primary_display.size(); 407 const gfx::Size& size = primary_display.size();
408 GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(), 408 GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
409 size.height()); 409 size.height());
410 } 410 }
411 } 411 }
412 412
413 } // namespace chromeos 413 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698