| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index a16a24a25898da4a806b2749fc116c72e17b8f1a..aa86bf007d438220a9ed4bffaa8120d647d32980 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -104,6 +104,7 @@
|
| #include "chrome/browser/chromeos/locale_change_guard.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/chromeos/preferences.h"
|
| +#include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/chromeos/proxy_config_service_impl.h"
|
| #endif
|
|
|
| @@ -275,7 +276,7 @@ int ProfileImpl::create_readme_delay_ms = 60000;
|
| const char* const ProfileImpl::kPrefExitTypeNormal = "Normal";
|
|
|
| // static
|
| -void ProfileImpl::RegisterUserPrefs(
|
| +void ProfileImpl::RegisterProfilePrefs(
|
| user_prefs::PrefRegistrySyncable* registry) {
|
| registry->RegisterBooleanPref(
|
| prefs::kSavingBrowserHistoryDisabled,
|
| @@ -397,7 +398,12 @@ ProfileImpl::ProfileImpl(
|
| create_mode == CREATE_MODE_SYNCHRONOUS);
|
| bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS;
|
|
|
| - chrome::RegisterUserPrefs(pref_registry_.get());
|
| +#if defined(OS_CHROMEOS)
|
| + if (chromeos::ProfileHelper::IsSigninProfile(this))
|
| + chrome::RegisterLoginProfilePrefs(pref_registry_.get());
|
| + else
|
| +#endif
|
| + chrome::RegisterUserProfilePrefs(pref_registry_.get());
|
|
|
| {
|
| // On startup, preference loading is always synchronous so a scoped timer
|
|
|