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

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

Issue 10496013: Implement the mac policy provider based on the AsyncPolicyLoader. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Renamed to PolicyLoaderMac 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
« no previous file with comments | « no previous file | chrome/browser/policy/configuration_policy_provider_mac.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 #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/cloud_policy_client.h" 14 #include "chrome/browser/policy/cloud_policy_client.h"
14 #include "chrome/browser/policy/cloud_policy_provider.h" 15 #include "chrome/browser/policy/cloud_policy_provider.h"
15 #include "chrome/browser/policy/cloud_policy_service.h" 16 #include "chrome/browser/policy/cloud_policy_service.h"
16 #include "chrome/browser/policy/cloud_policy_subsystem.h" 17 #include "chrome/browser/policy/cloud_policy_subsystem.h"
17 #include "chrome/browser/policy/configuration_policy_provider.h" 18 #include "chrome/browser/policy/configuration_policy_provider.h"
18 #include "chrome/browser/policy/device_management_service.h" 19 #include "chrome/browser/policy/device_management_service.h"
19 #include "chrome/browser/policy/policy_service_impl.h" 20 #include "chrome/browser/policy/policy_service_impl.h"
20 #include "chrome/browser/policy/user_cloud_policy_manager.h" 21 #include "chrome/browser/policy/user_cloud_policy_manager.h"
21 #include "chrome/browser/policy/user_policy_cache.h" 22 #include "chrome/browser/policy/user_policy_cache.h"
22 #include "chrome/browser/policy/user_policy_token_cache.h" 23 #include "chrome/browser/policy/user_policy_token_cache.h"
23 #include "chrome/browser/signin/token_service.h" 24 #include "chrome/browser/signin/token_service.h"
24 #include "chrome/common/chrome_notification_types.h" 25 #include "chrome/common/chrome_notification_types.h"
25 #include "chrome/common/chrome_paths.h" 26 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/chrome_switches.h" 27 #include "chrome/common/chrome_switches.h"
27 #include "chrome/common/net/gaia/gaia_constants.h" 28 #include "chrome/common/net/gaia/gaia_constants.h"
28 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
29 #include "content/public/browser/notification_details.h" 30 #include "content/public/browser/notification_details.h"
30 #include "content/public/browser/notification_source.h" 31 #include "content/public/browser/notification_source.h"
31 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
32 #include "policy/policy_constants.h" 33 #include "policy/policy_constants.h"
33 34
34 #if defined(OS_WIN) 35 #if defined(OS_WIN)
35 #include "chrome/browser/policy/configuration_policy_provider_win.h" 36 #include "chrome/browser/policy/configuration_policy_provider_win.h"
36 #elif defined(OS_MACOSX) 37 #elif defined(OS_MACOSX)
37 #include "chrome/browser/policy/configuration_policy_provider_mac.h" 38 #include "chrome/browser/policy/policy_loader_mac.h"
39 #include "chrome/browser/preferences_mac.h"
38 #elif defined(OS_POSIX) 40 #elif defined(OS_POSIX)
39 #include "chrome/browser/policy/config_dir_policy_provider.h" 41 #include "chrome/browser/policy/config_dir_policy_provider.h"
40 #endif 42 #endif
41 43
42 #if defined(OS_CHROMEOS) 44 #if defined(OS_CHROMEOS)
43 #include "chrome/browser/chromeos/cros/cros_library.h" 45 #include "chrome/browser/chromeos/cros/cros_library.h"
44 #include "chrome/browser/chromeos/system/statistics_provider.h" 46 #include "chrome/browser/chromeos/system/statistics_provider.h"
45 #include "chrome/browser/policy/app_pack_updater.h" 47 #include "chrome/browser/policy/app_pack_updater.h"
46 #include "chrome/browser/policy/cros_user_policy_cache.h" 48 #include "chrome/browser/policy/cros_user_policy_cache.h"
47 #include "chrome/browser/policy/device_policy_cache.h" 49 #include "chrome/browser/policy/device_policy_cache.h"
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 #endif 555 #endif
554 } 556 }
555 557
556 // static 558 // static
557 ConfigurationPolicyProvider* 559 ConfigurationPolicyProvider*
558 BrowserPolicyConnector::CreateManagedPlatformProvider() { 560 BrowserPolicyConnector::CreateManagedPlatformProvider() {
559 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList(); 561 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
560 #if defined(OS_WIN) 562 #if defined(OS_WIN)
561 return new ConfigurationPolicyProviderWin(policy_list); 563 return new ConfigurationPolicyProviderWin(policy_list);
562 #elif defined(OS_MACOSX) 564 #elif defined(OS_MACOSX)
563 return new ConfigurationPolicyProviderMac(policy_list); 565 scoped_ptr<AsyncPolicyLoader> loader(
566 new PolicyLoaderMac(policy_list, new MacPreferences()));
567 return new AsyncPolicyProvider(policy_list, loader.Pass());
564 #elif defined(OS_POSIX) 568 #elif defined(OS_POSIX)
565 FilePath config_dir_path; 569 FilePath config_dir_path;
566 if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) { 570 if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
567 return new ConfigDirPolicyProvider( 571 return new ConfigDirPolicyProvider(
568 policy_list, 572 policy_list,
569 POLICY_LEVEL_MANDATORY, 573 POLICY_LEVEL_MANDATORY,
570 POLICY_SCOPE_MACHINE, 574 POLICY_SCOPE_MACHINE,
571 config_dir_path.Append(FILE_PATH_LITERAL("managed"))); 575 config_dir_path.Append(FILE_PATH_LITERAL("managed")));
572 } else { 576 } else {
573 return NULL; 577 return NULL;
(...skipping 17 matching lines...) Expand all
591 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 595 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
592 } else { 596 } else {
593 return NULL; 597 return NULL;
594 } 598 }
595 #else 599 #else
596 return NULL; 600 return NULL;
597 #endif 601 #endif
598 } 602 }
599 603
600 } // namespace policy 604 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/policy/configuration_policy_provider_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698