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

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: 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 <string>
Joao da Silva 2011/08/31 15:14:44 Nit: already included in .h
8
7 #include "base/command_line.h" 9 #include "base/command_line.h"
8 #include "base/path_service.h" 10 #include "base/path_service.h"
9 #include "chrome/browser/net/gaia/token_service.h" 11 #include "chrome/browser/net/gaia/token_service.h"
10 #include "chrome/browser/policy/cloud_policy_data_store.h" 12 #include "chrome/browser/policy/cloud_policy_data_store.h"
11 #include "chrome/browser/policy/cloud_policy_provider.h" 13 #include "chrome/browser/policy/cloud_policy_provider.h"
12 #include "chrome/browser/policy/cloud_policy_provider_impl.h" 14 #include "chrome/browser/policy/cloud_policy_provider_impl.h"
13 #include "chrome/browser/policy/cloud_policy_subsystem.h" 15 #include "chrome/browser/policy/cloud_policy_subsystem.h"
14 #include "chrome/browser/policy/configuration_policy_pref_store.h" 16 #include "chrome/browser/policy/configuration_policy_pref_store.h"
15 #include "chrome/browser/policy/configuration_policy_provider.h" 17 #include "chrome/browser/policy/configuration_policy_provider.h"
16 #include "chrome/browser/policy/dummy_cloud_policy_provider.h" 18 #include "chrome/browser/policy/dummy_cloud_policy_provider.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 managed_cloud_provider_->PrependCache(user_policy_cache); 208 managed_cloud_provider_->PrependCache(user_policy_cache);
207 recommended_cloud_provider_->PrependCache(user_policy_cache); 209 recommended_cloud_provider_->PrependCache(user_policy_cache);
208 user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem( 210 user_cloud_policy_subsystem_.reset(new CloudPolicySubsystem(
209 user_data_store_.get(), 211 user_data_store_.get(),
210 user_policy_cache)); 212 user_policy_cache));
211 213
212 // Initiate the DM-Token load. 214 // Initiate the DM-Token load.
213 user_policy_token_cache_->Load(); 215 user_policy_token_cache_->Load();
214 216
215 user_data_store_->set_user_name(user_name); 217 user_data_store_->set_user_name(user_name);
218 user_data_store_->set_user_affiliation(GetUserAffiliation(user_name));
219
216 if (token_service_ && 220 if (token_service_ &&
217 token_service_->HasTokenForService( 221 token_service_->HasTokenForService(
218 GaiaConstants::kDeviceManagementService)) { 222 GaiaConstants::kDeviceManagementService)) {
219 user_data_store_->SetGaiaToken(token_service_->GetTokenForService( 223 user_data_store_->SetGaiaToken(token_service_->GetTokenForService(
220 GaiaConstants::kDeviceManagementService)); 224 GaiaConstants::kDeviceManagementService));
221 } 225 }
222 226
223 user_cloud_policy_subsystem_->CompleteInitialization( 227 user_cloud_policy_subsystem_->CompleteInitialization(
224 prefs::kUserPolicyRefreshRate, 228 prefs::kUserPolicyRefreshRate,
225 kServiceInitializationStartupDelay); 229 kServiceInitializationStartupDelay);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 void BrowserPolicyConnector::InitializeDevicePolicySubsystem() { 334 void BrowserPolicyConnector::InitializeDevicePolicySubsystem() {
331 #if defined(OS_CHROMEOS) 335 #if defined(OS_CHROMEOS)
332 if (device_cloud_policy_subsystem_.get()) { 336 if (device_cloud_policy_subsystem_.get()) {
333 device_cloud_policy_subsystem_->CompleteInitialization( 337 device_cloud_policy_subsystem_->CompleteInitialization(
334 prefs::kDevicePolicyRefreshRate, 338 prefs::kDevicePolicyRefreshRate,
335 kServiceInitializationStartupDelay); 339 kServiceInitializationStartupDelay);
336 } 340 }
337 #endif 341 #endif
338 } 342 }
339 343
344 CloudPolicyDataStore::UserAffiliation
345 BrowserPolicyConnector::GetUserAffiliation(const std::string& user_name) {
346 #if defined(OS_CHROMEOS)
347 if (install_attributes_.get()) {
348 size_t pos = user_name.find('@');
349 if (pos != std::string::npos &&
350 user_name.substr(pos + 1) == install_attributes_->GetDomain()) {
351 return CloudPolicyDataStore::USER_AFFILIATION_MANAGED;
352 }
353 }
354 #endif
355
356 return CloudPolicyDataStore::USER_AFFILIATION_NONE;
357 }
358
340 // static 359 // static
341 BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() { 360 BrowserPolicyConnector* BrowserPolicyConnector::CreateForTests() {
342 const ConfigurationPolicyProvider::PolicyDefinitionList* 361 const ConfigurationPolicyProvider::PolicyDefinitionList*
343 policy_list = ConfigurationPolicyPrefStore:: 362 policy_list = ConfigurationPolicyPrefStore::
344 GetChromePolicyDefinitionList(); 363 GetChromePolicyDefinitionList();
345 return new BrowserPolicyConnector( 364 return new BrowserPolicyConnector(
346 new policy::DummyConfigurationPolicyProvider(policy_list), 365 new policy::DummyConfigurationPolicyProvider(policy_list),
347 new policy::DummyConfigurationPolicyProvider(policy_list), 366 new policy::DummyConfigurationPolicyProvider(policy_list),
348 new policy::DummyCloudPolicyProvider(policy_list), 367 new policy::DummyCloudPolicyProvider(policy_list),
349 new policy::DummyCloudPolicyProvider(policy_list)); 368 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"))); 404 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
386 } else { 405 } else {
387 return new DummyConfigurationPolicyProvider(policy_list); 406 return new DummyConfigurationPolicyProvider(policy_list);
388 } 407 }
389 #else 408 #else
390 return new DummyConfigurationPolicyProvider(policy_list); 409 return new DummyConfigurationPolicyProvider(policy_list);
391 #endif 410 #endif
392 } 411 }
393 412
394 } // namespace 413 } // 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