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

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: addressed comments 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
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_provider.h" 14 #include "chrome/browser/policy/cloud_policy_provider.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_provider.h" 16 #include "chrome/browser/policy/configuration_policy_provider.h"
16 #include "chrome/browser/policy/policy_service_impl.h" 17 #include "chrome/browser/policy/policy_service_impl.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/browser/signin/token_service.h" 20 #include "chrome/browser/signin/token_service.h"
20 #include "chrome/common/chrome_notification_types.h" 21 #include "chrome/common/chrome_notification_types.h"
21 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
22 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/net/gaia/gaia_constants.h" 24 #include "chrome/common/net/gaia/gaia_constants.h"
24 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
25 #include "content/public/browser/notification_details.h" 26 #include "content/public/browser/notification_details.h"
26 #include "content/public/browser/notification_source.h" 27 #include "content/public/browser/notification_source.h"
27 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
28 #include "policy/policy_constants.h" 29 #include "policy/policy_constants.h"
29 30
30 #if defined(OS_WIN) 31 #if defined(OS_WIN)
31 #include "chrome/browser/policy/configuration_policy_provider_win.h" 32 #include "chrome/browser/policy/configuration_policy_provider_win.h"
32 #elif defined(OS_MACOSX) 33 #elif defined(OS_MACOSX)
33 #include "chrome/browser/policy/configuration_policy_provider_mac.h" 34 #include "chrome/browser/policy/policy_loader_mac.h"
35 #include "chrome/browser/preferences_mac.h"
34 #elif defined(OS_POSIX) 36 #elif defined(OS_POSIX)
35 #include "chrome/browser/policy/config_dir_policy_provider.h" 37 #include "chrome/browser/policy/config_dir_policy_provider.h"
36 #endif 38 #endif
37 39
38 #if defined(OS_CHROMEOS) 40 #if defined(OS_CHROMEOS)
39 #include "chrome/browser/chromeos/cros/cros_library.h" 41 #include "chrome/browser/chromeos/cros/cros_library.h"
40 #include "chrome/browser/chromeos/system/statistics_provider.h" 42 #include "chrome/browser/chromeos/system/statistics_provider.h"
41 #include "chrome/browser/policy/app_pack_updater.h" 43 #include "chrome/browser/policy/app_pack_updater.h"
42 #include "chrome/browser/policy/cros_user_policy_cache.h" 44 #include "chrome/browser/policy/cros_user_policy_cache.h"
43 #include "chrome/browser/policy/device_policy_cache.h" 45 #include "chrome/browser/policy/device_policy_cache.h"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 #endif 502 #endif
501 } 503 }
502 504
503 // static 505 // static
504 ConfigurationPolicyProvider* 506 ConfigurationPolicyProvider*
505 BrowserPolicyConnector::CreateManagedPlatformProvider() { 507 BrowserPolicyConnector::CreateManagedPlatformProvider() {
506 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList(); 508 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList();
507 #if defined(OS_WIN) 509 #if defined(OS_WIN)
508 return new ConfigurationPolicyProviderWin(policy_list); 510 return new ConfigurationPolicyProviderWin(policy_list);
509 #elif defined(OS_MACOSX) 511 #elif defined(OS_MACOSX)
510 return new ConfigurationPolicyProviderMac(policy_list); 512 scoped_ptr<AsyncPolicyLoader> loader(
513 new MacPolicyLoader(policy_list, new MacPreferences()));
514 return new AsyncPolicyProvider(policy_list, loader.Pass());
511 #elif defined(OS_POSIX) 515 #elif defined(OS_POSIX)
512 FilePath config_dir_path; 516 FilePath config_dir_path;
513 if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) { 517 if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
514 return new ConfigDirPolicyProvider( 518 return new ConfigDirPolicyProvider(
515 policy_list, 519 policy_list,
516 POLICY_LEVEL_MANDATORY, 520 POLICY_LEVEL_MANDATORY,
517 POLICY_SCOPE_MACHINE, 521 POLICY_SCOPE_MACHINE,
518 config_dir_path.Append(FILE_PATH_LITERAL("managed"))); 522 config_dir_path.Append(FILE_PATH_LITERAL("managed")));
519 } else { 523 } else {
520 return NULL; 524 return NULL;
(...skipping 17 matching lines...) Expand all
538 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 542 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
539 } else { 543 } else {
540 return NULL; 544 return NULL;
541 } 545 }
542 #else 546 #else
543 return NULL; 547 return NULL;
544 #endif 548 #endif
545 } 549 }
546 550
547 } // namespace policy 551 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698