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

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

Issue 552023002: Move ownership of HostPairingController from PairingScreen to 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
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b4c2eb95302917273dea5cb0face3518dfba67d1..121c5e99c9a4fa1d2014b6c29bb799650412c66b 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -74,6 +74,7 @@
#include "chromeos/settings/timezone_settings.h"
#include "components/crash/app/breakpad_linux.h"
#include "components/pairing/bluetooth_controller_pairing_controller.h"
+#include "components/pairing/bluetooth_host_pairing_controller.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_types.h"
@@ -330,8 +331,13 @@ WizardScreen* WizardController::CreateScreen(const std::string& screen_name) {
this, oobe_display_->GetControllerPairingScreenActor(),
controller_pairing_controller_.get());
} else if (screen_name == kHostPairingScreenName) {
+ if (!host_pairing_controller_) {
+ host_pairing_controller_.reset(
+ new pairing_chromeos::BluetoothHostPairingController());
+ }
return new HostPairingScreen(this,
- oobe_display_->GetHostPairingScreenActor());
+ oobe_display_->GetHostPairingScreenActor(),
+ host_pairing_controller_.get());
}
return NULL;
}
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698