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

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

Issue 8139029: Make policy errors available to display in about:policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad commit Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/stl_util.h"
11 #include "chrome/browser/net/gaia/token_service.h" 12 #include "chrome/browser/net/gaia/token_service.h"
12 #include "chrome/browser/policy/cloud_policy_provider.h" 13 #include "chrome/browser/policy/cloud_policy_provider.h"
13 #include "chrome/browser/policy/cloud_policy_provider_impl.h" 14 #include "chrome/browser/policy/cloud_policy_provider_impl.h"
14 #include "chrome/browser/policy/cloud_policy_subsystem.h" 15 #include "chrome/browser/policy/cloud_policy_subsystem.h"
15 #include "chrome/browser/policy/configuration_policy_pref_store.h" 16 #include "chrome/browser/policy/configuration_policy_pref_store.h"
16 #include "chrome/browser/policy/configuration_policy_provider.h" 17 #include "chrome/browser/policy/configuration_policy_provider.h"
17 #include "chrome/browser/policy/user_policy_cache.h" 18 #include "chrome/browser/policy/user_policy_cache.h"
18 #include "chrome/browser/policy/user_policy_token_cache.h" 19 #include "chrome/browser/policy/user_policy_token_cache.h"
19 #include "chrome/common/chrome_notification_types.h" 20 #include "chrome/common/chrome_notification_types.h"
20 #include "chrome/common/chrome_paths.h" 21 #include "chrome/common/chrome_paths.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 device_cloud_policy_subsystem_.reset(); 90 device_cloud_policy_subsystem_.reset();
90 device_data_store_.reset(); 91 device_data_store_.reset();
91 #endif 92 #endif
92 93
93 // Shutdown user cloud policy. 94 // Shutdown user cloud policy.
94 if (user_cloud_policy_subsystem_.get()) 95 if (user_cloud_policy_subsystem_.get())
95 user_cloud_policy_subsystem_->Shutdown(); 96 user_cloud_policy_subsystem_->Shutdown();
96 user_cloud_policy_subsystem_.reset(); 97 user_cloud_policy_subsystem_.reset();
97 user_policy_token_cache_.reset(); 98 user_policy_token_cache_.reset();
98 user_data_store_.reset(); 99 user_data_store_.reset();
100
101 STLDeleteElements(policy_handlers_.get());
99 } 102 }
100 103
101 ConfigurationPolicyProvider* 104 ConfigurationPolicyProvider*
102 BrowserPolicyConnector::GetManagedPlatformProvider() const { 105 BrowserPolicyConnector::GetManagedPlatformProvider() const {
103 return managed_platform_provider_.get(); 106 return managed_platform_provider_.get();
104 } 107 }
105 108
106 ConfigurationPolicyProvider* 109 ConfigurationPolicyProvider*
107 BrowserPolicyConnector::GetManagedCloudProvider() const { 110 BrowserPolicyConnector::GetManagedCloudProvider() const {
108 return managed_cloud_provider_.get(); 111 return managed_cloud_provider_.get();
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 #else 303 #else
301 return NULL; 304 return NULL;
302 #endif 305 #endif
303 } 306 }
304 307
305 const CloudPolicyDataStore* 308 const CloudPolicyDataStore*
306 BrowserPolicyConnector::GetUserCloudPolicyDataStore() const { 309 BrowserPolicyConnector::GetUserCloudPolicyDataStore() const {
307 return user_data_store_.get(); 310 return user_data_store_.get();
308 } 311 }
309 312
313 const ConfigurationPolicyHandler::HandlerList*
314 BrowserPolicyConnector::GetConfigurationPolicyHandlerList() const {
315 return policy_handlers_.get();
316 }
317
310 BrowserPolicyConnector::BrowserPolicyConnector() 318 BrowserPolicyConnector::BrowserPolicyConnector()
311 : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { 319 : ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
312 managed_platform_provider_.reset(CreateManagedPlatformProvider()); 320 managed_platform_provider_.reset(CreateManagedPlatformProvider());
313 recommended_platform_provider_.reset(CreateRecommendedPlatformProvider()); 321 recommended_platform_provider_.reset(CreateRecommendedPlatformProvider());
314 322
315 managed_cloud_provider_.reset(new CloudPolicyProviderImpl( 323 managed_cloud_provider_.reset(new CloudPolicyProviderImpl(
316 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(), 324 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
317 CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY)); 325 CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY));
318 recommended_cloud_provider_.reset(new CloudPolicyProviderImpl( 326 recommended_cloud_provider_.reset(new CloudPolicyProviderImpl(
319 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(), 327 ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList(),
320 CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED)); 328 CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED));
321 329
322 #if defined(OS_CHROMEOS) 330 #if defined(OS_CHROMEOS)
323 InitializeDevicePolicy(); 331 InitializeDevicePolicy();
324 #endif 332 #endif
333 policy_handlers_.reset(ConfigurationPolicyHandler::CreateHandlerList());
325 } 334 }
326 335
327 BrowserPolicyConnector::BrowserPolicyConnector( 336 BrowserPolicyConnector::BrowserPolicyConnector(
328 ConfigurationPolicyProvider* managed_platform_provider, 337 ConfigurationPolicyProvider* managed_platform_provider,
329 ConfigurationPolicyProvider* recommended_platform_provider, 338 ConfigurationPolicyProvider* recommended_platform_provider,
330 CloudPolicyProvider* managed_cloud_provider, 339 CloudPolicyProvider* managed_cloud_provider,
331 CloudPolicyProvider* recommended_cloud_provider) 340 CloudPolicyProvider* recommended_cloud_provider)
332 : managed_platform_provider_(managed_platform_provider), 341 : managed_platform_provider_(managed_platform_provider),
333 recommended_platform_provider_(recommended_platform_provider), 342 recommended_platform_provider_(recommended_platform_provider),
334 managed_cloud_provider_(managed_cloud_provider), 343 managed_cloud_provider_(managed_cloud_provider),
335 recommended_cloud_provider_(recommended_cloud_provider), 344 recommended_cloud_provider_(recommended_cloud_provider),
336 ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {} 345 ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
346 policy_handlers_.reset(ConfigurationPolicyHandler::CreateHandlerList());
347 }
337 348
338 void BrowserPolicyConnector::Observe(int type, 349 void BrowserPolicyConnector::Observe(int type,
339 const NotificationSource& source, 350 const NotificationSource& source,
340 const NotificationDetails& details) { 351 const NotificationDetails& details) {
341 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 352 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
342 if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) { 353 if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
343 const TokenService* token_source = 354 const TokenService* token_source =
344 Source<const TokenService>(source).ptr(); 355 Source<const TokenService>(source).ptr();
345 DCHECK_EQ(token_service_, token_source); 356 DCHECK_EQ(token_service_, token_source);
346 const TokenService::TokenAvailableDetails* token_details = 357 const TokenService::TokenAvailableDetails* token_details =
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 465 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
455 } else { 466 } else {
456 return NULL; 467 return NULL;
457 } 468 }
458 #else 469 #else
459 return NULL; 470 return NULL;
460 #endif 471 #endif
461 } 472 }
462 473
463 } // namespace policy 474 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698