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

Unified Diff: chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc

Issue 1130173002: Files.app: Relax condtion to skip OOBE demo mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
index b65e16bd765890e8f58ecd6f424dd4af8ddfefea..0c88882f7934986e6e7a98f219476db7c6e8dfaa 100644
--- a/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
+++ b/chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc
@@ -39,7 +39,13 @@ void DemoModeDetector::InitDetection() {
switches::kDisableDemoMode))
return;
- if (base::SysInfo::IsRunningOnChromeOS()) {
+ const bool has_derelict_switch =
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDerelictDetectionTimeout) ||
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDerelictIdleTimeout);
+
+ if (base::SysInfo::IsRunningOnChromeOS() && !has_derelict_switch) {
std::string track;
// We're running on an actual device; if we cannot find our release track
// value or if the track contains "testimage", don't start demo mode.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698