Index: chrome/browser/chromeos/login/wizard_controller.cc |
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc |
index b2da5d7627db75795634d95bf60c01d0bcda95c5..f934e870adc11950033ddbdfd5f63ba05ed2636d 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller.cc |
@@ -33,7 +33,7 @@ |
#include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h" |
#include "chrome/browser/chromeos/login/screens/error_screen.h" |
#include "chrome/browser/chromeos/login/screens/eula_screen.h" |
-#include "chrome/browser/chromeos/login/screens/hid_detection_view.h" |
+#include "chrome/browser/chromeos/login/screens/hid_detection_screen.h" |
#include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h" |
#include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h" |
#include "chrome/browser/chromeos/login/screens/network_view.h" |
@@ -217,7 +217,6 @@ |
user_image_screen_return_to_previous_hack_(false), |
timezone_resolved_(false), |
shark_controller_detected_(false), |
- hid_screen_(nullptr), |
weak_factory_(this) { |
DCHECK(default_controller_ == NULL); |
default_controller_ = this; |
@@ -329,10 +328,8 @@ |
return new SupervisedUserCreationScreen( |
this, oobe_display_->GetSupervisedUserCreationScreenActor()); |
} else if (screen_name == kHIDDetectionScreenName) { |
- scoped_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen( |
- this, oobe_display_->GetHIDDetectionView())); |
- screen->Initialize(nullptr /* context */); |
- return screen.release(); |
+ return new HIDDetectionScreen(this, |
+ oobe_display_->GetHIDDetectionScreenActor()); |
} else if (screen_name == kAutoEnrollmentCheckScreenName) { |
return new AutoEnrollmentCheckScreen( |
this, oobe_display_->GetAutoEnrollmentCheckScreenActor()); |
@@ -916,11 +913,11 @@ |
if (IsHostPairingOobe()) { |
ShowHostPairingScreen(); |
} else if (CanShowHIDDetectionScreen()) { |
- hid_screen_ = GetScreen(kHIDDetectionScreenName); |
base::Callback<void(bool)> on_check = base::Bind( |
&WizardController::OnHIDScreenNecessityCheck, |
weak_factory_.GetWeakPtr()); |
- oobe_display_->GetHIDDetectionView()->CheckIsScreenRequired(on_check); |
+ oobe_display_->GetHIDDetectionScreenActor()->CheckIsScreenRequired( |
+ on_check); |
} else { |
ShowNetworkScreen(); |
} |