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

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

Issue 113813003: Cleanup the policy code after the recent moves into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/profile_policy_connector.h" 5 #include "chrome/browser/policy/profile_policy_connector.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/browser/browser_process.h" 11 #include "chrome/browser/browser_process.h"
12 #include "chrome/browser/policy/browser_policy_connector.h" 12 #include "chrome/browser/policy/browser_policy_connector.h"
13 #include "chrome/browser/policy/policy_transformations.h"
14 #include "components/policy/core/common/cloud/cloud_policy_manager.h" 13 #include "components/policy/core/common/cloud/cloud_policy_manager.h"
15 #include "components/policy/core/common/configuration_policy_provider.h" 14 #include "components/policy/core/common/configuration_policy_provider.h"
16 #include "components/policy/core/common/forwarding_policy_provider.h" 15 #include "components/policy/core/common/forwarding_policy_provider.h"
17 #include "components/policy/core/common/policy_service_impl.h" 16 #include "components/policy/core/common/policy_service_impl.h"
18 17
19 #if defined(OS_CHROMEOS) 18 #if defined(OS_CHROMEOS)
20 #include "chrome/browser/chromeos/login/user.h" 19 #include "chrome/browser/chromeos/login/user.h"
21 #include "chrome/browser/chromeos/login/user_manager.h" 20 #include "chrome/browser/chromeos/login/user_manager.h"
22 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 21 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
23 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" 22 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser(); 80 is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser();
82 if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT) { 81 if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT) {
83 InitializeDeviceLocalAccountPolicyProvider(user->email(), 82 InitializeDeviceLocalAccountPolicyProvider(user->email(),
84 schema_registry); 83 schema_registry);
85 } 84 }
86 } 85 }
87 if (special_user_policy_provider_) 86 if (special_user_policy_provider_)
88 providers.push_back(special_user_policy_provider_.get()); 87 providers.push_back(special_user_policy_provider_.get());
89 #endif 88 #endif
90 89
91 policy_service_.reset(new PolicyServiceImpl( 90 policy_service_.reset(new PolicyServiceImpl(providers));
92 providers, base::Bind(&policy::FixDeprecatedPolicies)));
93 91
94 #if defined(OS_CHROMEOS) 92 #if defined(OS_CHROMEOS)
95 if (is_primary_user_) { 93 if (is_primary_user_) {
96 if (user_cloud_policy_manager) 94 if (user_cloud_policy_manager)
97 connector->SetUserPolicyDelegate(user_cloud_policy_manager); 95 connector->SetUserPolicyDelegate(user_cloud_policy_manager);
98 else if (special_user_policy_provider_) 96 else if (special_user_policy_provider_)
99 connector->SetUserPolicyDelegate(special_user_policy_provider_.get()); 97 connector->SetUserPolicyDelegate(special_user_policy_provider_.get());
100 } 98 }
101 #endif 99 #endif
102 } 100 }
(...skipping 23 matching lines...) Expand all
126 connector->GetDeviceLocalAccountPolicyService(); 124 connector->GetDeviceLocalAccountPolicyService();
127 if (!device_local_account_policy_service) 125 if (!device_local_account_policy_service)
128 return; 126 return;
129 special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider( 127 special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider(
130 username, device_local_account_policy_service)); 128 username, device_local_account_policy_service));
131 special_user_policy_provider_->Init(schema_registry); 129 special_user_policy_provider_->Init(schema_registry);
132 } 130 }
133 #endif 131 #endif
134 132
135 } // namespace policy 133 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_transformations_unittest.cc ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698