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

Side by Side Diff: chrome/browser/policy/browser_policy_connector.h

Issue 10928036: Implement Chrome OS device enrollment on the new cloud policy stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CloudPolicyClient error handling. Created 8 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/policy/cloud_policy_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 UserAffiliation GetUserAffiliation(const std::string& user_name); 157 UserAffiliation GetUserAffiliation(const std::string& user_name);
158 158
159 AppPackUpdater* GetAppPackUpdater(); 159 AppPackUpdater* GetAppPackUpdater();
160 160
161 NetworkConfigurationUpdater* GetNetworkConfigurationUpdater(); 161 NetworkConfigurationUpdater* GetNetworkConfigurationUpdater();
162 162
163 DeviceManagementService* device_management_service() { 163 DeviceManagementService* device_management_service() {
164 return device_management_service_.get(); 164 return device_management_service_.get();
165 } 165 }
166 166
167 #if defined(OS_CHROMEOS)
168 DeviceCloudPolicyManagerChromeOS* GetDeviceCloudPolicyManager() {
169 return device_cloud_policy_manager_.get();
170 }
171 #endif
172
167 // Sets a |provider| that will be included in PolicyServices returned by 173 // Sets a |provider| that will be included in PolicyServices returned by
168 // CreatePolicyService. This is a static method because local state is 174 // CreatePolicyService. This is a static method because local state is
169 // created immediately after the connector, and tests don't have a chance to 175 // created immediately after the connector, and tests don't have a chance to
170 // inject the provider otherwise. |provider| must outlive the connector, and 176 // inject the provider otherwise. |provider| must outlive the connector, and
171 // its ownership is not taken though the connector will initialize and shut it 177 // its ownership is not taken though the connector will initialize and shut it
172 // down. 178 // down.
173 static void SetPolicyProviderForTesting( 179 static void SetPolicyProviderForTesting(
174 ConfigurationPolicyProvider* provider); 180 ConfigurationPolicyProvider* provider);
175 181
176 // Gets the URL of the DM server (either the default or a URL provided via the 182 // Gets the URL of the DM server (either the default or a URL provided via the
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 scoped_ptr<AppPackUpdater> app_pack_updater_; 260 scoped_ptr<AppPackUpdater> app_pack_updater_;
255 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; 261 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
256 #endif 262 #endif
257 263
258 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector); 264 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
259 }; 265 };
260 266
261 } // namespace policy 267 } // namespace policy
262 268
263 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ 269 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/cloud_policy_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698