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

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: . 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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 if (recommended_cloud_provider_.get()) 171 if (recommended_cloud_provider_.get())
170 providers.push_back(recommended_cloud_provider_.get()); 172 providers.push_back(recommended_cloud_provider_.get());
171 173
172 // The global policy service uses the proxy provider to allow for swapping in 174 // The global policy service uses the proxy provider to allow for swapping in
173 // user policy after startup, while profiles use |user_cloud_policy_manager_| 175 // user policy after startup, while profiles use |user_cloud_policy_manager_|
174 // directly as their provider, which may also block initialization on a policy 176 // directly as their provider, which may also block initialization on a policy
175 // fetch at login time. 177 // fetch at login time.
176 if (profile) { 178 if (profile) {
177 if (user_cloud_policy_manager_.get()) 179 if (user_cloud_policy_manager_.get())
178 providers.push_back(user_cloud_policy_manager_.get()); 180 providers.push_back(user_cloud_policy_manager_.get());
181
182 providers.push_back(
183 ManagedModePolicyProviderFactory::GetForProfile(profile));
Mattias Nissler (ping if slow) 2012/06/06 17:22:09 This is another instance of relying on OnProviderG
179 } else { 184 } else {
180 providers.push_back(&user_cloud_policy_provider_); 185 providers.push_back(&user_cloud_policy_provider_);
181 } 186 }
182 187
183 return new PolicyServiceImpl(providers); 188 return new PolicyServiceImpl(providers);
184 } 189 }
185 190
186 void BrowserPolicyConnector::RegisterForDevicePolicy( 191 void BrowserPolicyConnector::RegisterForDevicePolicy(
187 const std::string& owner_email, 192 const std::string& owner_email,
188 const std::string& token, 193 const std::string& token,
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 return new AsyncPolicyProvider(policy_list, loader.Pass()); 575 return new AsyncPolicyProvider(policy_list, loader.Pass());
571 } else { 576 } else {
572 return NULL; 577 return NULL;
573 } 578 }
574 #else 579 #else
575 return NULL; 580 return NULL;
576 #endif 581 #endif
577 } 582 }
578 583
579 } // namespace policy 584 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698