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

Unified Diff: chrome/browser/chromeos/login/screens/host_pairing_screen.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
Index: chrome/browser/chromeos/login/screens/host_pairing_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
index c4a0671c7763036aa03325f70925b427a21e762d..dcd5e7b16039d3311a42784be09fee42c784d842 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.cc
@@ -6,20 +6,22 @@
#include "base/command_line.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "components/pairing/bluetooth_host_pairing_controller.h"
+#include "components/pairing/host_pairing_controller.h"
namespace chromeos {
using namespace host_pairing;
using namespace pairing_chromeos;
-HostPairingScreen::HostPairingScreen(ScreenObserver* observer,
- HostPairingScreenActor* actor)
+HostPairingScreen::HostPairingScreen(
+ ScreenObserver* observer,
+ HostPairingScreenActor* actor,
+ pairing_chromeos::HostPairingController* controller)
: WizardScreen(observer),
actor_(actor),
+ controller_(controller),
current_stage_(HostPairingController::STAGE_NONE) {
actor_->SetDelegate(this);
- controller_.reset(new BluetoothHostPairingController());
controller_->AddObserver(this);
}
« no previous file with comments | « chrome/browser/chromeos/login/screens/host_pairing_screen.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698