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

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

Issue 1183893005: ChromeOS: user whitelist check should happen before entering password. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years, 5 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
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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 } 278 }
279 279
280 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) { 280 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) {
281 NOTREACHED(); 281 NOTREACHED();
282 } 282 }
283 283
284 void WebUIScreenLocker::Signout() { 284 void WebUIScreenLocker::Signout() {
285 chromeos::ScreenLocker::default_screen_locker()->Signout(); 285 chromeos::ScreenLocker::default_screen_locker()->Signout();
286 } 286 }
287 287
288 bool WebUIScreenLocker::IsUserWhitelisted(const std::string& user_id) {
289 NOTREACHED();
290 return true;
291 }
288 //////////////////////////////////////////////////////////////////////////////// 292 ////////////////////////////////////////////////////////////////////////////////
289 // LockWindow::Observer: 293 // LockWindow::Observer:
290 294
291 void WebUIScreenLocker::OnLockWindowReady() { 295 void WebUIScreenLocker::OnLockWindowReady() {
292 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not"); 296 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not");
293 lock_ready_ = true; 297 lock_ready_ = true;
294 if (webui_ready_) 298 if (webui_ready_)
295 ScreenLockReady(); 299 ScreenLockReady();
296 } 300 }
297 301
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 } 411 }
408 412
409 if (GetOobeUI()) { 413 if (GetOobeUI()) {
410 const gfx::Size& size = primary_display.size(); 414 const gfx::Size& size = primary_display.size();
411 GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(), 415 GetOobeUI()->GetCoreOobeActor()->SetClientAreaSize(size.width(),
412 size.height()); 416 size.height());
413 } 417 }
414 } 418 }
415 419
416 } // namespace chromeos 420 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/webui_screen_locker.h ('k') | chrome/browser/chromeos/login/ui/login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698