Revert of HID-detection screen moved to screenContext.

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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 189 matching lines @@
 const char OobeUI::kScreenDeviceDisabled[] = "device-disabled";
 
 OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
     : WebUIController(web_ui),
       core_handler_(nullptr),
       network_dropdown_handler_(nullptr),
       update_screen_handler_(nullptr),
       network_view_(nullptr),
       debugging_screen_actor_(nullptr),
       eula_view_(nullptr),
-      hid_detection_view_(nullptr),
+      hid_detection_screen_actor_(nullptr),
       reset_screen_actor_(nullptr),
       autolaunch_screen_actor_(nullptr),
       kiosk_enable_screen_actor_(nullptr),
       wrong_hwid_screen_actor_(nullptr),
       auto_enrollment_check_screen_actor_(nullptr),
       supervised_user_creation_screen_actor_(nullptr),
       app_launch_splash_screen_actor_(nullptr),
       controller_pairing_screen_actor_(nullptr),
       host_pairing_screen_actor_(nullptr),
       device_disabled_screen_actor_(nullptr),
@@ skipping 63 matching lines @@
   wrong_hwid_screen_actor_ = wrong_hwid_screen_handler;
   AddScreenHandler(wrong_hwid_screen_handler);
 
   AutoEnrollmentCheckScreenHandler* auto_enrollment_check_screen_handler =
       new AutoEnrollmentCheckScreenHandler();
   auto_enrollment_check_screen_actor_ = auto_enrollment_check_screen_handler;
   AddScreenHandler(auto_enrollment_check_screen_handler);
 
   HIDDetectionScreenHandler* hid_detection_screen_handler =
       new HIDDetectionScreenHandler(core_handler_);
-  hid_detection_view_ = hid_detection_screen_handler;
+  hid_detection_screen_actor_ = hid_detection_screen_handler;
   AddScreenHandler(hid_detection_screen_handler);
 
   error_screen_handler_ = new ErrorScreenHandler(network_state_informer_);
   AddScreenHandler(error_screen_handler_);
 
   // Initialize ErrorScreen if it hasn't initialized.
   if (WizardController::default_controller()) {
     BaseScreen* screen = WizardController::default_controller()->GetScreen(
         WizardController::kErrorScreenName);
     CHECK(screen);
@@ skipping 137 matching lines @@
 }
 
 WrongHWIDScreenActor* OobeUI::GetWrongHWIDScreenActor() {
   return wrong_hwid_screen_actor_;
 }
 
 AutoEnrollmentCheckScreenActor* OobeUI::GetAutoEnrollmentCheckScreenActor() {
   return auto_enrollment_check_screen_actor_;
 }
 
-HIDDetectionView* OobeUI::GetHIDDetectionView() {
-  return hid_detection_view_;
+HIDDetectionScreenActor* OobeUI::GetHIDDetectionScreenActor() {
+  return hid_detection_screen_actor_;
 }
 
 ControllerPairingScreenActor* OobeUI::GetControllerPairingScreenActor() {
   return controller_pairing_screen_actor_;
 }
 
 HostPairingScreenActor* OobeUI::GetHostPairingScreenActor() {
   return host_pairing_screen_actor_;
 }
 
@@ skipping 189 matching lines @@
   DCHECK(screen_ids_.count(screen))
       << "Screen should be registered in InitializeScreenMaps()";
   Screen new_screen = screen_ids_[screen];
   FOR_EACH_OBSERVER(Observer,
                     observer_list_,
                     OnCurrentScreenChanged(current_screen_, new_screen));
   current_screen_ = new_screen;
 }
 
 }  // namespace chromeos