HID-detection screen moved to screenContext.

chrome/browser/chromeos/login/wizard_controller.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/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 17 matching lines @@
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/hwid_checker.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
 #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"
 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h"
@@ skipping 157 matching lines @@
       is_out_of_box_(false),
       host_(host),
       oobe_display_(oobe_display),
       usage_statistics_reporting_(true),
       skip_update_enroll_after_eula_(false),
       retry_auto_enrollment_check_(false),
       login_screen_started_(false),
       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;
   AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
   CHECK(accessibility_manager);
   accessibility_subscription_ = accessibility_manager->RegisterCallback(
       base::Bind(&WizardController::OnAccessibilityStatusChanged,
                  base::Unretained(this)));
 }
 
@@ skipping 98 matching lines @@
   } else if (screen_name == kTermsOfServiceScreenName) {
     return new chromeos::TermsOfServiceScreen(
         this, oobe_display_->GetTermsOfServiceScreenActor());
   } else if (screen_name == kWrongHWIDScreenName) {
     return new chromeos::WrongHWIDScreen(
         this, oobe_display_->GetWrongHWIDScreenActor());
   } else if (screen_name == kSupervisedUserCreationScreenName) {
     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());
   } else if (screen_name == kControllerPairingScreenName) {
     if (!shark_controller_) {
       shark_controller_.reset(
           new pairing_chromeos::BluetoothControllerPairingController());
     }
     return new ControllerPairingScreen(
         this,
@@ skipping 11 matching lines @@
                                  oobe_display_->GetHostPairingScreenActor(),
                                  remora_controller_.get());
   } else if (screen_name == kDeviceDisabledScreenName) {
     return new chromeos::DeviceDisabledScreen(
         this, oobe_display_->GetDeviceDisabledScreenActor());
   }
 
   return NULL;
 }
 
 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.
   SetStatusAreaVisible(HasScreen(kNetworkScreenName));
   SetCurrentScreen(GetScreen(kNetworkScreenName));
 
   MaybeStartListeningForSharkConnection();
 }
 
 void WizardController::ShowLoginScreen(const LoginScreenContext& context) {
@@ skipping 423 matching lines @@
   // Restart to make the login page pick up the policy changes resulting from
   // enrollment recovery.
   // TODO(tnagel): Find a way to update login page without reboot.
   if (prescribed_enrollment_config_.mode ==
       policy::EnrollmentConfig::MODE_RECOVERY) {
     chrome::AttemptRestart();
   }
 }
 
 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;
 
   // First remember how far have we reached so that we can resume if needed.
   if (is_out_of_box_ && IsResumableScreen(current_screen_->GetName()))
     StartupUtils::SaveOobePendingScreen(current_screen_->GetName());
 
   smooth_show_timer_.Stop();
 
   FOR_EACH_OBSERVER(Observer, observer_list_, OnScreenChanged(current_screen_));
 
   current_screen_->Show();
 }
 
 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;
   }
 
   smooth_show_timer_.Stop();
 
   if (current_screen_)
     current_screen_->Hide();
 
   std::string screen_id = new_current->GetName();
   if (IsOOBEStepToTrack(screen_id))
@@ skipping 15 matching lines @@
 
 void WizardController::SetStatusAreaVisible(bool visible) {
   host_->SetStatusAreaVisible(visible);
 }
 
 void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) {
   if (!oobe_display_)
     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();
 }
 
 void WizardController::AdvanceToScreen(const std::string& screen_name) {
   if (screen_name == kNetworkScreenName) {
     ShowNetworkScreen();
   } else if (screen_name == kLoginScreenName) {
     ShowLoginScreen(LoginScreenContext());
   } else if (screen_name == kUpdateScreenName) {
@@ skipping 29 matching lines @@
   } else if (screen_name == kHostPairingScreenName) {
     ShowHostPairingScreen();
   } else if (screen_name == kDeviceDisabledScreenName) {
     ShowDeviceDisabledScreen();
   } else if (screen_name != kTestNoScreenName) {
     if (is_out_of_box_) {
       time_oobe_started_ = base::Time::Now();
       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();
       }
     } else {
       ShowLoginScreen(LoginScreenContext());
     }
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 367 matching lines @@
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get(),
                         remora_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos