Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 424 profile->GetPath())); | 424 profile->GetPath())); |
| 425 | 425 |
| 426 // Use the device-wide system key slot only if the user is of the same | 426 // Use the device-wide system key slot only if the user is of the same |
| 427 // domain as the device is registered to. | 427 // domain as the device is registered to. |
| 428 policy::BrowserPolicyConnectorChromeOS* connector = | 428 policy::BrowserPolicyConnectorChromeOS* connector = |
| 429 g_browser_process->platform_part() | 429 g_browser_process->platform_part() |
| 430 ->browser_policy_connector_chromeos(); | 430 ->browser_policy_connector_chromeos(); |
| 431 params->use_system_key_slot = | 431 params->use_system_key_slot = |
| 432 connector->GetUserAffiliation(user->email()) == | 432 connector->GetUserAffiliation(user->email()) == |
| 433 policy::USER_AFFILIATION_MANAGED; | 433 policy::USER_AFFILIATION_MANAGED; |
| 434 } else { | |
| 435 params->use_system_key_slot = | |
|
pneubeck (no reviews)
2014/12/02 11:56:47
use_system_key_slot=true has two effects:
- trigg
| |
| 436 chromeos::ProfileHelper::IsSigninProfile(profile); | |
| 434 } | 437 } |
| 435 } | 438 } |
| 436 #endif | 439 #endif |
| 437 | 440 |
| 438 params->profile = profile; | 441 params->profile = profile; |
| 439 params->prerender_tracker = g_browser_process->prerender_tracker(); | 442 params->prerender_tracker = g_browser_process->prerender_tracker(); |
| 440 profile_params_.reset(params.release()); | 443 profile_params_.reset(params.release()); |
| 441 | 444 |
| 442 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 445 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| 443 &enable_referrers_, | 446 &enable_referrers_, |
| (...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1303 void ProfileIOData::SetCookieSettingsForTesting( | 1306 void ProfileIOData::SetCookieSettingsForTesting( |
| 1304 CookieSettings* cookie_settings) { | 1307 CookieSettings* cookie_settings) { |
| 1305 DCHECK(!cookie_settings_.get()); | 1308 DCHECK(!cookie_settings_.get()); |
| 1306 cookie_settings_ = cookie_settings; | 1309 cookie_settings_ = cookie_settings; |
| 1307 } | 1310 } |
| 1308 | 1311 |
| 1309 void ProfileIOData::set_signin_names_for_testing( | 1312 void ProfileIOData::set_signin_names_for_testing( |
| 1310 SigninNamesOnIOThread* signin_names) { | 1313 SigninNamesOnIOThread* signin_names) { |
| 1311 signin_names_.reset(signin_names); | 1314 signin_names_.reset(signin_names); |
| 1312 } | 1315 } |
| OLD | NEW |