chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc - Issue 551263004: Merge ac4db7aca56d6ea9cda598f7076690de8a90df79 to M37.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 551263004: Merge ac4db7aca56d6ea9cda598f7076690de8a90df79 to M37. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2062

Patch Set: Created 6 years, 3 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 | « chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc ('k') | chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc

index 5babef62aef497ddba6cb8e43fd82a0843fd1e38..0174b6152d6223a88d1b5525513737f7dab321ce 100644

--- a/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.cc

@@ -114,8 +114,7 @@ void HIDDetectionScreenHandler::Show() {

show_on_init_ = true;

return;

}

- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableDemoMode))

- core_oobe_actor_->InitDemoModeDetection();

+ core_oobe_actor_->InitDemoModeDetection();

input_service_proxy_.AddObserver(this);

first_time_screen_show_ = true;

GetDevicesFirstTime();