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

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

Issue 10510006: Add ManagedModePolicyProvider and extension API to get and set policies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 6 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 #include "chrome/browser/policy/browser_policy_connector.h" 5 #include "chrome/browser/policy/browser_policy_connector.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/policy/async_policy_provider.h" 13 #include "chrome/browser/policy/async_policy_provider.h"
14 #include "chrome/browser/policy/cloud_policy_client.h" 14 #include "chrome/browser/policy/cloud_policy_client.h"
15 #include "chrome/browser/policy/cloud_policy_provider.h" 15 #include "chrome/browser/policy/cloud_policy_provider.h"
16 #include "chrome/browser/policy/cloud_policy_service.h" 16 #include "chrome/browser/policy/cloud_policy_service.h"
17 #include "chrome/browser/policy/cloud_policy_subsystem.h" 17 #include "chrome/browser/policy/cloud_policy_subsystem.h"
18 #include "chrome/browser/policy/configuration_policy_provider.h" 18 #include "chrome/browser/policy/configuration_policy_provider.h"
19 #include "chrome/browser/policy/device_management_service.h" 19 #include "chrome/browser/policy/device_management_service.h"
20 #include "chrome/browser/policy/managed_mode_policy_provider.h"
21 #include "chrome/browser/policy/managed_mode_policy_provider_factory.h"
20 #include "chrome/browser/policy/policy_service_impl.h" 22 #include "chrome/browser/policy/policy_service_impl.h"
21 #include "chrome/browser/policy/user_cloud_policy_manager.h" 23 #include "chrome/browser/policy/user_cloud_policy_manager.h"
22 #include "chrome/browser/policy/user_policy_cache.h" 24 #include "chrome/browser/policy/user_policy_cache.h"
23 #include "chrome/browser/policy/user_policy_token_cache.h" 25 #include "chrome/browser/policy/user_policy_token_cache.h"
24 #include "chrome/browser/signin/token_service.h" 26 #include "chrome/browser/signin/token_service.h"
25 #include "chrome/common/chrome_notification_types.h" 27 #include "chrome/common/chrome_notification_types.h"
26 #include "chrome/common/chrome_paths.h" 28 #include "chrome/common/chrome_paths.h"
27 #include "chrome/common/chrome_switches.h" 29 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/net/gaia/gaia_constants.h" 30 #include "chrome/common/net/gaia/gaia_constants.h"
29 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 if (recommended_cloud_provider_.get()) 166 if (recommended_cloud_provider_.get())
165 providers.push_back(recommended_cloud_provider_.get()); 167 providers.push_back(recommended_cloud_provider_.get());
166 168
167 // The global policy service uses the proxy provider to allow for swapping in 169 // The global policy service uses the proxy provider to allow for swapping in
168 // user policy after startup, while profiles use |user_cloud_policy_manager_| 170 // user policy after startup, while profiles use |user_cloud_policy_manager_|
169 // directly as their provider, which may also block initialization on a policy 171 // directly as their provider, which may also block initialization on a policy
170 // fetch at login time. 172 // fetch at login time.
171 if (profile) { 173 if (profile) {
172 if (user_cloud_policy_manager_.get()) 174 if (user_cloud_policy_manager_.get())
173 providers.push_back(user_cloud_policy_manager_.get()); 175 providers.push_back(user_cloud_policy_manager_.get());
176
177 providers.push_back(
178 ManagedModePolicyProviderFactory::GetForProfile(profile));
174 } else { 179 } else {
175 providers.push_back(&user_cloud_policy_provider_); 180 providers.push_back(&user_cloud_policy_provider_);
176 } 181 }
177 182
178 return new PolicyServiceImpl(providers); 183 return new PolicyServiceImpl(providers);
179 } 184 }
180 185
181 void BrowserPolicyConnector::RegisterForDevicePolicy( 186 void BrowserPolicyConnector::RegisterForDevicePolicy(
182 const std::string& owner_email, 187 const std::string& owner_email,
183 const std::string& token, 188 const std::string& token,
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 return new AsyncPolicyProvider(loader.Pass()); 571 return new AsyncPolicyProvider(loader.Pass());
567 } else { 572 } else {
568 return NULL; 573 return NULL;
569 } 574 }
570 #else 575 #else
571 return NULL; 576 return NULL;
572 #endif 577 #endif
573 } 578 }
574 579
575 } // namespace policy 580 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_managed_mode_api.cc ('k') | chrome/browser/policy/managed_mode_policy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698