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

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

Issue 22914008: Refactor kiosk app launch to be part of login screen UI flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 } 264 }
265 265
266 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) { 266 void WebUIScreenLocker::SetDisplayEmail(const std::string& email) {
267 NOTREACHED(); 267 NOTREACHED();
268 } 268 }
269 269
270 void WebUIScreenLocker::Signout() { 270 void WebUIScreenLocker::Signout() {
271 chromeos::ScreenLocker::default_screen_locker()->Signout(); 271 chromeos::ScreenLocker::default_screen_locker()->Signout();
272 } 272 }
273 273
274 void WebUIScreenLocker::LoginAsKioskApp(const std::string& app_id) {
275 NOTREACHED();
276 }
277
274 //////////////////////////////////////////////////////////////////////////////// 278 ////////////////////////////////////////////////////////////////////////////////
275 // LockWindow::Observer implementation: 279 // LockWindow::Observer implementation:
276 280
277 void WebUIScreenLocker::OnLockWindowReady() { 281 void WebUIScreenLocker::OnLockWindowReady() {
278 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not"); 282 VLOG(1) << "Lock window ready; WebUI is " << (webui_ready_ ? "too" : "not");
279 lock_ready_ = true; 283 lock_ready_ = true;
280 if (webui_ready_) 284 if (webui_ready_)
281 ScreenLockReady(); 285 ScreenLockReady();
282 } 286 }
283 287
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 326
323 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) { 327 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {
324 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID && 328 if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
325 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) { 329 status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
326 LOG(ERROR) << "Renderer crash on lock screen"; 330 LOG(ERROR) << "Renderer crash on lock screen";
327 Signout(); 331 Signout();
328 } 332 }
329 } 333 }
330 334
331 } // namespace chromeos 335 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/webui_screen_locker.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698