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

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

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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 | Annotate | Revision Log
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 <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/observer_list.h" 13 #include "base/observer_list.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "base/timer.h" 15 #include "base/timer.h"
16 #include "chrome/browser/chromeos/login/screen_observer.h" 16 #include "chrome/browser/chromeos/login/screen_observer.h"
17 #include "chrome/browser/chromeos/login/wizard_screen.h" 17 #include "chrome/browser/chromeos/login/wizard_screen.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "ui/gfx/rect.h" 19 #include "ui/gfx/rect.h"
20 20
21 class PrefServiceSimple; 21 class PrefRegistrySimple;
22 22
23 namespace base { 23 namespace base {
24 class DictionaryValue; 24 class DictionaryValue;
25 } 25 }
26 26
27 namespace chromeos { 27 namespace chromeos {
28 28
29 class EnterpriseEnrollmentScreen; 29 class EnterpriseEnrollmentScreen;
30 class EulaScreen; 30 class EulaScreen;
31 class HTMLPageScreen; 31 class HTMLPageScreen;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // Sets delays to zero. MUST be used only for tests. 92 // Sets delays to zero. MUST be used only for tests.
93 static void SetZeroDelays(); 93 static void SetZeroDelays();
94 94
95 // If true zero delays have been enabled (for browser tests). 95 // If true zero delays have been enabled (for browser tests).
96 static bool IsZeroDelayEnabled(); 96 static bool IsZeroDelayEnabled();
97 97
98 // Sets initial locale in local settings. 98 // Sets initial locale in local settings.
99 static void SetInitialLocale(const std::string& locale); 99 static void SetInitialLocale(const std::string& locale);
100 100
101 // Registers OOBE preferences. 101 // Registers OOBE preferences.
102 static void RegisterPrefs(PrefServiceSimple* local_state); 102 static void RegisterPrefs(PrefRegistrySimple* registry);
103 103
104 // Marks user image screen to be always skipped after login. 104 // Marks user image screen to be always skipped after login.
105 static void SkipImageSelectionForTesting(); 105 static void SkipImageSelectionForTesting();
106 106
107 // Shows the first screen defined by |first_screen_name| or by default 107 // Shows the first screen defined by |first_screen_name| or by default
108 // if the parameter is empty. Takes ownership of |screen_parameters|. 108 // if the parameter is empty. Takes ownership of |screen_parameters|.
109 void Init(const std::string& first_screen_name, 109 void Init(const std::string& first_screen_name,
110 base::DictionaryValue* screen_parameters); 110 base::DictionaryValue* screen_parameters);
111 111
112 // Advances to screen defined by |screen_name| and shows it. 112 // Advances to screen defined by |screen_name| and shows it.
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators); 294 FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
295 friend class WizardControllerFlowTest; 295 friend class WizardControllerFlowTest;
296 friend class WizardInProcessBrowserTest; 296 friend class WizardInProcessBrowserTest;
297 297
298 DISALLOW_COPY_AND_ASSIGN(WizardController); 298 DISALLOW_COPY_AND_ASSIGN(WizardController);
299 }; 299 };
300 300
301 } // namespace chromeos 301 } // namespace chromeos
302 302
303 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_ 303 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.cc ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698