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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 9265026: Implement restart on Idle for Kiosk Mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 00681a314bc127328f3f0cb7885cc90a475624bc..dea47c74aff626a9c04e9fb3946504fecfced846 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/chromeos/external_metrics.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screen_locker.h"
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/login_utils.h"
#include "chrome/browser/chromeos/login/ownership_service.h"
@@ -359,7 +360,11 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
// Initialize the screen locker now so that it can receive
// LOGIN_USER_CHANGED notification from UserManager.
- chromeos::ScreenLocker::InitClass();
+ if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableKioskMode)) {
+ chromeos::KioskModeScreenLocker::InitClass();
+ } else {
+ chromeos::ScreenLocker::InitClass();
+ }
// This forces the ProfileManager to be created and register for the
// notification it needs to track the logged in user.

Powered by Google App Engine
This is Rietveld 408576698