Commit b80bbb74 authored by rkc@chromium.org's avatar rkc@chromium.org

Don't start demo mode on a test image.

R=xiyuan@chromium.org
BUG=368004

Review URL: https://codereview.chromium.org/270973002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269525 0039d316-1c4b-4281-b951-d872f2087c98
parent dd180457
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
...@@ -165,6 +166,14 @@ void NetworkScreenHandler::Show() { ...@@ -165,6 +166,14 @@ void NetworkScreenHandler::Show() {
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode)) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode))
return; return;
if (base::SysInfo::IsRunningOnChromeOS()) {
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.
if (!base::SysInfo::GetLsbReleaseValue("CHROMEOS_RELEASE_TRACK", &track) ||
track.find("testimage") != std::string::npos)
return;
}
if (IsDerelict()) if (IsDerelict())
StartIdleDetection(); StartIdleDetection();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment