Base version of HID detection OOBE screen.

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 114 matching lines @@
                 path) == kKnownDisplayTypes + arraysize(kKnownDisplayTypes)) {
     LOG(ERROR) << "Unknown display type '" << path << "'. Setting default.";
     return kLoginDisplay;
   }
   return path;
 }
 
 }  // namespace
 
 // static
+const char OobeUI::kScreenOobeHIDDetection[]

[ygorshenin1, 2014/04/24 11:30:24]

nit: incorrect indent here.

[merkulova, 2014/04/24 12:49:46]

Done.

+                                            = "hid-detection";
 const char OobeUI::kScreenOobeNetwork[]     = "connect";
 const char OobeUI::kScreenOobeEula[]        = "eula";
 const char OobeUI::kScreenOobeUpdate[]      = "update";
 const char OobeUI::kScreenOobeEnrollment[]  = "oauth-enrollment";
 const char OobeUI::kScreenOobeReset[]       = "reset";
 const char OobeUI::kScreenGaiaSignin[]      = "gaia-signin";
 const char OobeUI::kScreenAccountPicker[]   = "account-picker";
 const char OobeUI::kScreenKioskAutolaunch[] = "autolaunch";
 const char OobeUI::kScreenKioskEnable[]     = "kiosk-enable";
 const char OobeUI::kScreenErrorMessage[]    = "error-message";
@@ skipping 247 matching lines @@
       system::InputDeviceSettings::Get()->ForceKeyboardDrivenUINavigation();
   localized_strings->SetString("highlightStrength",
                                keyboard_driven_oobe ? "strong" : "normal");
 
   bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
   localized_strings->SetString("newKioskUI", new_kiosk_ui ? "on" : "off");
 }
 
 void OobeUI::InitializeScreenMaps() {
   screen_names_.resize(SCREEN_UNKNOWN);
+  screen_names_[SCREEN_OOBE_HID_DETECTION] = kScreenOobeHIDDetection;
   screen_names_[SCREEN_OOBE_NETWORK] = kScreenOobeNetwork;
   screen_names_[SCREEN_OOBE_EULA] = kScreenOobeEula;
   screen_names_[SCREEN_OOBE_UPDATE] = kScreenOobeUpdate;
   screen_names_[SCREEN_OOBE_ENROLLMENT] = kScreenOobeEnrollment;
   screen_names_[SCREEN_OOBE_RESET] = kScreenOobeReset;
   screen_names_[SCREEN_GAIA_SIGNIN] = kScreenGaiaSignin;
   screen_names_[SCREEN_ACCOUNT_PICKER] = kScreenAccountPicker;
   screen_names_[SCREEN_KIOSK_AUTOLAUNCH] = kScreenKioskAutolaunch;
   screen_names_[SCREEN_KIOSK_ENABLE] = kScreenKioskEnable;
   screen_names_[SCREEN_ERROR_MESSAGE] = kScreenErrorMessage;
@@ skipping 92 matching lines @@
                       observer_list_,
                       OnCurrentScreenChanged(current_screen_, new_screen));
     current_screen_ = new_screen;
   } else {
     NOTREACHED() << "Screen should be registered in InitializeScreenMaps()";
     current_screen_ = SCREEN_UNKNOWN;
   }
 }
 
 }  // namespace chromeos