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

Side by Side Diff: chrome/browser/policy/browser_policy_connector.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_POLICY_BROWSER_POLICY_CONNECTOR_H_ 5 #ifndef CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
6 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ 6 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "chrome/browser/policy/cloud_policy_constants.h" 13 #include "chrome/browser/policy/cloud_policy_constants.h"
14 #include "chrome/browser/policy/configuration_policy_handler_list.h" 14 #include "chrome/browser/policy/configuration_policy_handler_list.h"
15 #include "chrome/browser/policy/proxy_policy_provider.h" 15 #include "chrome/browser/policy/proxy_policy_provider.h"
16 16
17 class PrefServiceSimple; 17 class PrefRegistrySimple;
18 class Profile; 18 class Profile;
19 19
20 namespace policy { 20 namespace policy {
21 21
22 class ConfigurationPolicyProvider; 22 class ConfigurationPolicyProvider;
23 class DeviceManagementService; 23 class DeviceManagementService;
24 class PolicyService; 24 class PolicyService;
25 class PolicyStatisticsCollector; 25 class PolicyStatisticsCollector;
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 // Gets the URL of the DM server (either the default or a URL provided via the 141 // Gets the URL of the DM server (either the default or a URL provided via the
142 // command line). 142 // command line).
143 static std::string GetDeviceManagementUrl(); 143 static std::string GetDeviceManagementUrl();
144 144
145 // Check whether a user is known to be non-enterprise. Domains such as 145 // Check whether a user is known to be non-enterprise. Domains such as
146 // gmail.com and googlemail.com are known to not be managed. Also returns 146 // gmail.com and googlemail.com are known to not be managed. Also returns
147 // false if the username is empty. 147 // false if the username is empty.
148 static bool IsNonEnterpriseUser(const std::string& username); 148 static bool IsNonEnterpriseUser(const std::string& username);
149 149
150 // Registers refresh rate prefs. 150 // Registers refresh rate prefs.
151 static void RegisterPrefs(PrefServiceSimple* local_state); 151 static void RegisterPrefs(PrefRegistrySimple* registry);
152 152
153 private: 153 private:
154 // Complete initialization once the message loops are running and the 154 // Complete initialization once the message loops are running and the
155 // local_state is initialized. 155 // local_state is initialized.
156 void CompleteInitialization(); 156 void CompleteInitialization();
157 157
158 // Set the timezone as soon as the policies are available. 158 // Set the timezone as soon as the policies are available.
159 void SetTimezoneIfPolicyAvailable(); 159 void SetTimezoneIfPolicyAvailable();
160 160
161 // Creates a new PolicyService with the shared policy providers and the given 161 // Creates a new PolicyService with the shared policy providers and the given
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 scoped_ptr<AppPackUpdater> app_pack_updater_; 212 scoped_ptr<AppPackUpdater> app_pack_updater_;
213 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; 213 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
214 #endif 214 #endif
215 215
216 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector); 216 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
217 }; 217 };
218 218
219 } // namespace policy 219 } // namespace policy
220 220
221 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ 221 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/policy/auto_enrollment_client.cc ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698