Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3708)

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 539733002: Move ownership of the ControllerPairingController into the WizardController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f9c9ed29b1146bcf6777494594111164e2c0d858..fb4e8f6e8b9337b6849a83b15650965c9914bb37 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -73,6 +73,7 @@
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/settings/timezone_settings.h"
#include "components/crash/app/breakpad_linux.h"
+#include "components/pairing/bluetooth_controller_pairing_controller.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_types.h"
@@ -362,8 +363,13 @@ WizardScreen* WizardController::CreateScreen(const std::string& screen_name) {
return new chromeos::AutoEnrollmentCheckScreen(
this, oobe_display_->GetAutoEnrollmentCheckScreenActor());
} else if (screen_name == kControllerPairingScreenName) {
+ if (!controller_pairing_controller_) {
+ controller_pairing_controller_.reset(
+ new pairing_chromeos::BluetoothControllerPairingController());
+ }
return new ControllerPairingScreen(
- this, oobe_display_->GetControllerPairingScreenActor());
+ this, oobe_display_->GetControllerPairingScreenActor(),
+ controller_pairing_controller_.get());
} else if (screen_name == kHostPairingScreenName) {
return new HostPairingScreen(this,
oobe_display_->GetHostPairingScreenActor());

Powered by Google App Engine
This is Rietveld 408576698