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 a0f29e430d43c52aa2af8a9934d4d851c6c0d6d7..bb5369410f19a915a70188b762c8fcd2ed9e5b6a 100644 |
--- a/chrome/browser/chromeos/login/wizard_controller.cc |
+++ b/chrome/browser/chromeos/login/wizard_controller.cc |
@@ -35,7 +35,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_screen.h" |
+#include "chrome/browser/chromeos/login/screens/hid_detection_view.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" |
@@ -213,6 +213,7 @@ WizardController::WizardController(chromeos::LoginDisplayHost* host, |
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; |
@@ -331,8 +332,10 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) { |
return new chromeos::SupervisedUserCreationScreen( |
this, oobe_display_->GetSupervisedUserCreationScreenActor()); |
} else if (screen_name == kHIDDetectionScreenName) { |
- return new chromeos::HIDDetectionScreen( |
- this, oobe_display_->GetHIDDetectionScreenActor()); |
+ scoped_ptr<HIDDetectionScreen> screen(new chromeos::HIDDetectionScreen( |
+ this, oobe_display_->GetHIDDetectionView())); |
+ screen->Initialize(nullptr /* context */); |
+ return screen.release(); |
} else if (screen_name == kAutoEnrollmentCheckScreenName) { |
return new chromeos::AutoEnrollmentCheckScreen( |
this, oobe_display_->GetAutoEnrollmentCheckScreenActor()); |
@@ -365,6 +368,7 @@ BaseScreen* WizardController::CreateScreen(const std::string& screen_name) { |
} |
void WizardController::ShowNetworkScreen() { |
Denis Kuznetsov (DE-MUC)
2015/02/03 13:31:42
Do you still need this debug output?
merkulova
2015/02/03 14:41:01
Done.
|
+ LOG(ERROR) << "Showing network screen."; |
VLOG(1) << "Showing network screen."; |
// Hide the status area initially; it only appears after OOBE first animates |
// in. Keep it visible if the user goes back to the existing network screen. |
@@ -808,12 +812,14 @@ void WizardController::PerformOOBECompletedActions() { |
} |
void WizardController::SetCurrentScreen(BaseScreen* new_current) { |
+ LOG(ERROR) << "SetCurrentScreen"; |
Denis Kuznetsov (DE-MUC)
2015/02/03 13:31:42
same here
merkulova
2015/02/03 14:41:01
Done.
|
SetCurrentScreenSmooth(new_current, false); |
} |
void WizardController::ShowCurrentScreen() { |
// ShowCurrentScreen may get called by smooth_show_timer_ even after |
// flow has been switched to sign in screen (ExistingUserController). |
+ LOG(ERROR) << "ShowCurrentScreen"; |
Denis Kuznetsov (DE-MUC)
2015/02/03 13:31:42
And here
merkulova
2015/02/03 14:41:01
Done.
|
if (!oobe_display_) |
return; |
@@ -830,9 +836,11 @@ void WizardController::ShowCurrentScreen() { |
void WizardController::SetCurrentScreenSmooth(BaseScreen* new_current, |
bool use_smoothing) { |
+ LOG(ERROR) << "SetCurrentScreenSmooth"; |
Denis Kuznetsov (DE-MUC)
2015/02/03 13:31:42
Here and below
merkulova
2015/02/03 14:41:01
Done.
|
if (current_screen_ == new_current || |
new_current == NULL || |
oobe_display_ == NULL) { |
+ LOG(ERROR) << "1"; |
return; |
} |
@@ -868,6 +876,7 @@ void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) { |
return; |
if (screen_needed) |
ShowHIDDetectionScreen(); |
+ |
Denis Kuznetsov (DE-MUC)
2015/02/03 13:31:42
Drop empty line
merkulova
2015/02/03 14:41:01
Done.
|
else |
ShowNetworkScreen(); |
} |
@@ -917,11 +926,12 @@ void WizardController::AdvanceToScreen(const std::string& screen_name) { |
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_->GetHIDDetectionScreenActor()->CheckIsScreenRequired( |
- on_check); |
+ LOG(ERROR) << "Before check"; |
Denis Kuznetsov (DE-MUC)
2015/02/03 13:31:42
Debug outut
merkulova
2015/02/03 14:41:01
Done.
|
+ oobe_display_->GetHIDDetectionView()->CheckIsScreenRequired(on_check); |
} else { |
ShowNetworkScreen(); |
} |