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

Side by Side Diff: chrome/browser/chromeos/login/screen_manager.h

Issue 2739073002: cros: Use ScreenManager as a component instead of deriving WizardController from it (Closed)
Patch Set: Address comment Created 3 years, 9 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_SCREEN_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/linked_ptr.h"
14 #include "chrome/browser/chromeos/login/screens/base_screen.h" 14 #include "chrome/browser/chromeos/login/screens/base_screen.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 class WizardController;
19
18 // Class that manages creation and ownership of screens. 20 // Class that manages creation and ownership of screens.
19 class ScreenManager { 21 class ScreenManager {
20 public: 22 public:
21 ScreenManager(); 23 // |wizard_controller| is not owned by this class.
22 virtual ~ScreenManager(); 24 explicit ScreenManager(WizardController* wizard_controller);
25 ~ScreenManager();
23 26
24 // Getter for screen with lazy initialization. 27 // Getter for screen with lazy initialization.
25 virtual BaseScreen* GetScreen(OobeScreen screen); 28 BaseScreen* GetScreen(OobeScreen screen);
26
27 // Factory for screen instances.
28 virtual BaseScreen* CreateScreen(OobeScreen screen) = 0;
29 29
30 bool HasScreen(OobeScreen screen); 30 bool HasScreen(OobeScreen screen);
31 31
32 private: 32 private:
33 FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel); 33 FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel);
34 FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators); 34 FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
35 friend class WizardControllerFlowTest; 35 friend class WizardControllerFlowTest;
36 friend class WizardControllerOobeResumeTest; 36 friend class WizardControllerOobeResumeTest;
37 friend class WizardInProcessBrowserTest; 37 friend class WizardInProcessBrowserTest;
38 friend class WizardControllerBrokenLocalStateTest; 38 friend class WizardControllerBrokenLocalStateTest;
39 39
40 // Screens. 40 // Created screens.
41 std::map<OobeScreen, linked_ptr<BaseScreen>> screens_; 41 std::map<OobeScreen, std::unique_ptr<BaseScreen>> screens_;
42
43 // Used to allocate BaseScreen instances. Unowned.
44 WizardController* wizard_controller_;
42 45
43 DISALLOW_COPY_AND_ASSIGN(ScreenManager); 46 DISALLOW_COPY_AND_ASSIGN(ScreenManager);
44 }; 47 };
45 48
46 } // namespace chromeos 49 } // namespace chromeos
47 50
48 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_MANAGER_H_ 51 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/oobe_localization_browsertest.cc ('k') | chrome/browser/chromeos/login/screen_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698