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

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

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.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index ee03e9e786fba160c2e9ad570562c8bfe8359075..7815cf2b8806d1a4d9251ed3151b1e8794b29d87 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -28,6 +28,10 @@ namespace base {
class DictionaryValue;
}
+namespace pairing_chromeos {
+class ControllerPairingController;
+}
+
namespace chromeos {
class AutoEnrollmentCheckScreen;
@@ -388,6 +392,10 @@ class WizardController : public ScreenObserver {
scoped_ptr<SimpleGeolocationProvider> geolocation_provider_;
scoped_ptr<TimeZoneProvider> timezone_provider_;
+ // Pairing controller for shark devices.
+ scoped_ptr<pairing_chromeos::ControllerPairingController>
+ controller_pairing_controller_;
+
// Maps screen ids to last time of their shows.
base::hash_map<std::string, base::Time> screen_show_times_;

Powered by Google App Engine
This is Rietveld 408576698