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

Unified Diff: chrome/browser/chromeos/login/screens/host_pairing_screen.h

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 | « no previous file | chrome/browser/chromeos/login/screens/host_pairing_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/host_pairing_screen.h
diff --git a/chrome/browser/chromeos/login/screens/host_pairing_screen.h b/chrome/browser/chromeos/login/screens/host_pairing_screen.h
index 7a5229fb64a004ccca44dfa876c86759b249bd10..c69f5f8b38b82aecbc9c586f4b1a15c64935058e 100644
--- a/chrome/browser/chromeos/login/screens/host_pairing_screen.h
+++ b/chrome/browser/chromeos/login/screens/host_pairing_screen.h
@@ -18,7 +18,8 @@ class HostPairingScreen :
public pairing_chromeos::HostPairingController::Observer,
public HostPairingScreenActor::Delegate {
public:
- HostPairingScreen(ScreenObserver* observer, HostPairingScreenActor* actor);
+ HostPairingScreen(ScreenObserver* observer, HostPairingScreenActor* actor,
+ pairing_chromeos::HostPairingController* controller);
virtual ~HostPairingScreen();
private:
@@ -50,9 +51,8 @@ class HostPairingScreen :
HostPairingScreenActor* actor_;
- // Controller performing pairing. Owned by the screen for now.
- // TODO(dzhioev): move to proper place later.
- scoped_ptr<pairing_chromeos::HostPairingController> controller_;
+ // Controller performing pairing. Owned by the wizard controller.
+ pairing_chromeos::HostPairingController* controller_;
// Current stage of pairing process.
Stage current_stage_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/host_pairing_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698