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

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

Issue 56623005: Policy providers all get a SchemaRegistry to work with. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-policy-schema-9-purge-with-callback
Patch Set: rebase Created 7 years, 1 month 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) 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/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/policy/browser_policy_connector.h" 11 #include "chrome/browser/policy/browser_policy_connector.h"
12 #include "chrome/browser/policy/cloud/cloud_policy_manager.h" 12 #include "chrome/browser/policy/cloud/cloud_policy_manager.h"
13 #include "chrome/browser/policy/configuration_policy_provider.h" 13 #include "chrome/browser/policy/configuration_policy_provider.h"
14 #include "chrome/browser/policy/policy_service.h" 14 #include "chrome/browser/policy/policy_service.h"
15 #include "chrome/browser/policy/schema_registry_service.h"
16 #include "chrome/browser/policy/schema_registry_service_factory.h"
15 17
16 #if defined(OS_CHROMEOS) 18 #if defined(OS_CHROMEOS)
17 #include "base/bind.h" 19 #include "base/bind.h"
18 #include "base/prefs/pref_service.h" 20 #include "base/prefs/pref_service.h"
19 #include "chrome/browser/chromeos/login/user.h" 21 #include "chrome/browser/chromeos/login/user.h"
20 #include "chrome/browser/chromeos/login/user_manager.h" 22 #include "chrome/browser/chromeos/login/user_manager.h"
21 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" 23 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
22 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h" 24 #include "chrome/browser/chromeos/policy/login_profile_policy_provider.h"
23 #include "chrome/browser/policy/policy_service.h" 25 #include "chrome/browser/policy/policy_service.h"
24 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
(...skipping 24 matching lines...) Expand all
49 std::vector<ConfigurationPolicyProvider*> providers; 51 std::vector<ConfigurationPolicyProvider*> providers;
50 52
51 if (user_cloud_policy_manager) 53 if (user_cloud_policy_manager)
52 providers.push_back(user_cloud_policy_manager); 54 providers.push_back(user_cloud_policy_manager);
53 55
54 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
55 if (!user) { 57 if (!user) {
56 // This case occurs for the signin profile. 58 // This case occurs for the signin profile.
57 special_user_policy_provider_.reset( 59 special_user_policy_provider_.reset(
58 new LoginProfilePolicyProvider(connector->GetPolicyService())); 60 new LoginProfilePolicyProvider(connector->GetPolicyService()));
59 special_user_policy_provider_->Init(); 61 special_user_policy_provider_->Init(
62 SchemaRegistryServiceFactory::GetForContext(profile_));
60 } else { 63 } else {
61 // |user| should never be NULL except for the signin profile. 64 // |user| should never be NULL except for the signin profile.
62 is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser(); 65 is_primary_user_ = user == chromeos::UserManager::Get()->GetPrimaryUser();
63 if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT) 66 if (user->GetType() == chromeos::User::USER_TYPE_PUBLIC_ACCOUNT)
64 InitializeDeviceLocalAccountPolicyProvider(user->email()); 67 InitializeDeviceLocalAccountPolicyProvider(user->email());
65 } 68 }
66 if (special_user_policy_provider_) 69 if (special_user_policy_provider_)
67 providers.push_back(special_user_policy_provider_.get()); 70 providers.push_back(special_user_policy_provider_.get());
68 #endif 71 #endif
69 72
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 void ProfilePolicyConnector::InitializeDeviceLocalAccountPolicyProvider( 118 void ProfilePolicyConnector::InitializeDeviceLocalAccountPolicyProvider(
116 const std::string& username) { 119 const std::string& username) {
117 BrowserPolicyConnector* connector = 120 BrowserPolicyConnector* connector =
118 g_browser_process->browser_policy_connector(); 121 g_browser_process->browser_policy_connector();
119 DeviceLocalAccountPolicyService* device_local_account_policy_service = 122 DeviceLocalAccountPolicyService* device_local_account_policy_service =
120 connector->GetDeviceLocalAccountPolicyService(); 123 connector->GetDeviceLocalAccountPolicyService();
121 if (!device_local_account_policy_service) 124 if (!device_local_account_policy_service)
122 return; 125 return;
123 special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider( 126 special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider(
124 username, device_local_account_policy_service)); 127 username, device_local_account_policy_service));
125 special_user_policy_provider_->Init(); 128 special_user_policy_provider_->Init(
129 SchemaRegistryServiceFactory::GetForContext(profile_));
126 } 130 }
127 #endif 131 #endif
128 132
129 } // namespace policy 133 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_service_stub.cc ('k') | chrome/browser/policy/profile_policy_connector_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698