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

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

Issue 7810025: Pass user_affiliation request parameter on user cloud policy requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build breakage. Created 9 years, 3 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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/browser/net/gaia/token_service.h" 9 #include "chrome/browser/net/gaia/token_service.h"
10 #include "chrome/browser/policy/cloud_policy_data_store.h" 10 #include "chrome/browser/policy/cloud_policy_data_store.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 managed_cloud_provider_->PrependCache(user_policy_cache); 206 managed_cloud_provider_->PrependCache(user_policy_cache);
207 recommended_cloud_provider_->PrependCache(user_policy_cache); 207 recommended_cloud_provider_->PrependCache(user_policy_cache);
208 user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem( 208 user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
209 user_data_store_.get(), 209 user_data_store_.get(),
210 user_policy_cache)); 210 user_policy_cache));
211 211
212 // Initiate the DM-Token load. 212 // Initiate the DM-Token load.
213 user_policy_token_cache_->Load(); 213 user_policy_token_cache_->Load();
214 214
215 user_data_store_->set_user_name(user_name); 215 user_data_store_->set_user_name(user_name);
216 user_data_store_->set_user_affiliation(GetUserAffiliation(user_name));
217
216 if (token_service_ && 218 if (token_service_ &&
217 token_service_->HasTokenForService( 219 token_service_->HasTokenForService(
218 GaiaConstants::kDeviceManagementService)) { 220 GaiaConstants::kDeviceManagementService)) {
219 user_data_store_->SetGaiaToken(token_service_->GetTokenForService( 221 user_data_store_->SetGaiaToken(token_service_->GetTokenForService(
220 GaiaConstants::kDeviceManagementService)); 222 GaiaConstants::kDeviceManagementService));
221 } 223 }
222 224
223 user_cloud_policy_subsystem_->CompleteInitialization( 225 user_cloud_policy_subsystem_->CompleteInitialization(
224 prefs::kUserPolicyRefreshRate, 226 prefs::kUserPolicyRefreshRate,
225 kServiceInitializationStartupDelay); 227 kServiceInitializationStartupDelay);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 void BrowserPolicyConnector::InitializeDevicePolicySubsystem() { 332 void BrowserPolicyConnector::InitializeDevicePolicySubsystem() {
331 #if defined(OS_CHROMEOS) 333 #if defined(OS_CHROMEOS)
332 if (device_cloud_policy_subsystem_.get()) { 334 if (device_cloud_policy_subsystem_.get()) {
333 device_cloud_policy_subsystem_->CompleteInitialization( 335 device_cloud_policy_subsystem_->CompleteInitialization(
334 prefs::kDevicePolicyRefreshRate, 336 prefs::kDevicePolicyRefreshRate,
335 kServiceInitializationStartupDelay); 337 kServiceInitializationStartupDelay);
336 } 338 }
337 #endif 339 #endif
338 } 340 }
339 341
342 CloudPolicyDataStore::UserAffiliation
343 BrowserPolicyConnector::GetUserAffiliation(const std::string& user_name) {
344 #if defined(OS_CHROMEOS)
345 if (install_attributes_.get()) {
346 size_t pos = user_name.find('@');
347 if (pos != std::string::npos &&
348 user_name.substr(pos + 1) == install_attributes_->GetDomain()) {
349 return CloudPolicyDataStore::USER_AFFILIATION_MANAGED;
350 }
351 }
352 #endif
353
354 return CloudPolicyDataStore::USER_AFFILIATION_NONE;
355 }
356
340 // static 357 // static
341 BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() { 358 BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() {
342 const ConfigurationPolicyProvider::PolicyDefinitionList* 359 const ConfigurationPolicyProvider::PolicyDefinitionList*
343 policy_list = ConfigurationPolicyPrefStore:: 360 policy_list = ConfigurationPolicyPrefStore::
344 GetChromePolicyDefinitionList(); 361 GetChromePolicyDefinitionList();
345 return new BrowserPolicyConnector( 362 return new BrowserPolicyConnector(
346 new policy::DummyConfigurationPolicyProvider(policy_list), 363 new policy::DummyConfigurationPolicyProvider(policy_list),
347 new policy::DummyConfigurationPolicyProvider(policy_list), 364 new policy::DummyConfigurationPolicyProvider(policy_list),
348 new policy::DummyCloudPolicyProvider(policy_list), 365 new policy::DummyCloudPolicyProvider(policy_list),
349 new policy::DummyCloudPolicyProvider(policy_list)); 366 new policy::DummyCloudPolicyProvider(policy_list));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 402 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
386 } else { 403 } else {
387 return new DummyConfigurationPolicyProvider(policy_list); 404 return new DummyConfigurationPolicyProvider(policy_list);
388 } 405 }
389 #else 406 #else
390 return new DummyConfigurationPolicyProvider(policy_list); 407 return new DummyConfigurationPolicyProvider(policy_list);
391 #endif 408 #endif
392 } 409 }
393 410
394 } // namespace 411 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.h ('k') | chrome/browser/policy/cloud_policy_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698