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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 13 matching lines...) Expand all
24 24
25 class PrefRegistrySimple; 25 class PrefRegistrySimple;
26 class PrefService; 26 class PrefService;
27 27
28 namespace base { 28 namespace base {
29 class DictionaryValue; 29 class DictionaryValue;
30 } 30 }
31 31
32 namespace pairing_chromeos { 32 namespace pairing_chromeos {
33 class ControllerPairingController; 33 class ControllerPairingController;
34 class HostPairingController;
34 } 35 }
35 36
36 namespace chromeos { 37 namespace chromeos {
37 38
38 class AutoEnrollmentCheckScreen; 39 class AutoEnrollmentCheckScreen;
39 class EnrollmentScreen; 40 class EnrollmentScreen;
40 class ErrorScreen; 41 class ErrorScreen;
41 struct Geoposition; 42 struct Geoposition;
42 class LoginDisplayHost; 43 class LoginDisplayHost;
43 class LoginScreenContext; 44 class LoginScreenContext;
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 378
378 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 379 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
379 380
380 scoped_ptr<SimpleGeolocationProvider> geolocation_provider_; 381 scoped_ptr<SimpleGeolocationProvider> geolocation_provider_;
381 scoped_ptr<TimeZoneProvider> timezone_provider_; 382 scoped_ptr<TimeZoneProvider> timezone_provider_;
382 383
383 // Pairing controller for shark devices. 384 // Pairing controller for shark devices.
384 scoped_ptr<pairing_chromeos::ControllerPairingController> 385 scoped_ptr<pairing_chromeos::ControllerPairingController>
385 controller_pairing_controller_; 386 controller_pairing_controller_;
386 387
388 // Pairing controller for remora devices.
389 scoped_ptr<pairing_chromeos::HostPairingController> host_pairing_controller_;
390
387 // Maps screen ids to last time of their shows. 391 // Maps screen ids to last time of their shows.
388 base::hash_map<std::string, base::Time> screen_show_times_; 392 base::hash_map<std::string, base::Time> screen_show_times_;
389 393
390 // Tests check result of timezone resolve. 394 // Tests check result of timezone resolve.
391 bool timezone_resolved_; 395 bool timezone_resolved_;
392 base::Closure on_timezone_resolved_for_testing_; 396 base::Closure on_timezone_resolved_for_testing_;
393 397
394 base::WeakPtrFactory<WizardController> weak_factory_; 398 base::WeakPtrFactory<WizardController> weak_factory_;
395 399
396 DISALLOW_COPY_AND_ASSIGN(WizardController); 400 DISALLOW_COPY_AND_ASSIGN(WizardController);
397 }; 401 };
398 402
399 } // namespace chromeos 403 } // namespace chromeos
400 404
401 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 405 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/host_pairing_screen.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698