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

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

Issue 273533004: Flag covering HID-detection OOBE screen removed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 6 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/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 69ec08c4e83811692c10948be81f6ff594f2a078..93925ae6b3c34294ceaa8233a0243f92fc542311 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
@@ -64,9 +64,11 @@ bool DeviceIsKeyboard(device::BluetoothDevice::DeviceType device_type) {
namespace chromeos {
-HIDDetectionScreenHandler::HIDDetectionScreenHandler()
+HIDDetectionScreenHandler::HIDDetectionScreenHandler(
+ CoreOobeActor* core_oobe_actor)
: BaseScreenHandler(kJsScreenPath),
delegate_(NULL),
+ core_oobe_actor_(core_oobe_actor),
show_on_init_(false),
mouse_is_pairing_(false),
keyboard_is_pairing_(false),
@@ -103,6 +105,7 @@ void HIDDetectionScreenHandler::Show() {
show_on_init_ = true;
return;
}
+ core_oobe_actor_->InitDemoModeDetection();
input_service_proxy_.AddObserver(this);
first_time_screen_show_ = true;
GetDevicesFirstTime();
@@ -174,6 +177,7 @@ void HIDDetectionScreenHandler::HandleOnContinue() {
scenario_type,
CONTINUE_SCENARIO_TYPE_SIZE);
}
+ core_oobe_actor_->StopDemoModeDetection();
if (delegate_)
delegate_->OnExit();
}

Powered by Google App Engine
This is Rietveld 408576698