| Index: chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_launcher_prefs.cc b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| index 3d6081783cfbf664b68c0e148fae050e8591efc7..ed925e738a5466ce887aea21a949e14660742c4c 100644
|
| --- a/chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| +++ b/chrome/browser/ui/ash/chrome_launcher_prefs.cc
|
| @@ -57,28 +57,15 @@ void RegisterChromeLauncherUserPrefs(
|
| registry->RegisterStringPref(prefs::kShelfAutoHideBehavior,
|
| kShelfAutoHideBehaviorNever,
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| - registry->RegisterStringPref(
|
| - prefs::kShelfAutoHideBehaviorLocal,
|
| - std::string(),
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(prefs::kShelfAutoHideBehaviorLocal,
|
| + std::string());
|
| registry->RegisterStringPref(prefs::kShelfAlignment,
|
| kShelfAlignmentBottom,
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| - registry->RegisterStringPref(
|
| - prefs::kShelfAlignmentLocal,
|
| - std::string(),
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterDictionaryPref(
|
| - prefs::kShelfPreferences,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterIntegerPref(
|
| - prefs::kLogoutDialogDurationMs,
|
| - 20000,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(
|
| - prefs::kShowLogoutButtonInTray,
|
| - false,
|
| - user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(prefs::kShelfAlignmentLocal, std::string());
|
| + registry->RegisterDictionaryPref(prefs::kShelfPreferences);
|
| + registry->RegisterIntegerPref(prefs::kLogoutDialogDurationMs, 20000);
|
| + registry->RegisterBooleanPref(prefs::kShowLogoutButtonInTray, false);
|
| }
|
|
|
| base::DictionaryValue* CreateAppDict(const std::string& app_id) {
|
|
|