| Index: chrome/browser/ui/browser_ui_prefs.cc
|
| diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
|
| index bf0047afc71f6a7da8e43fe3bf096f1e7ad8d9fe..94b879136bc0fb2d694fb9939cf9d47d26a87d3c 100644
|
| --- a/chrome/browser/ui/browser_ui_prefs.cc
|
| +++ b/chrome/browser/ui/browser_ui_prefs.cc
|
| @@ -37,17 +37,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| prefs::kShowHomeButton,
|
| false,
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| -#if defined(OS_MACOSX)
|
| - // This really belongs in platform code, but there's no good place to
|
| - // initialize it between the time when the AppController is created
|
| - // (where there's no profile) and the time the controller gets another
|
| - // crack at the start of the main event loop. By that time,
|
| - // StartupBrowserCreator has already created the browser window, and it's too
|
| - // late: we need the pref to be already initialized. Doing it here also saves
|
| - // us from having to hard-code pref registration in the several unit tests
|
| - // that use this preference.
|
| - registry->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
|
| -#endif
|
| registry->RegisterBooleanPref(
|
| prefs::kDeleteBrowsingHistory,
|
| true,
|
| @@ -135,7 +124,21 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| registry->RegisterBooleanPref(prefs::kPluginsAlwaysAuthorize, false);
|
| registry->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true);
|
| registry->RegisterBooleanPref(prefs::kHideWebStoreIcon, false);
|
| -#if !defined(OS_MACOSX)
|
| +#if defined(OS_MACOSX)
|
| + // This really belongs in platform code, but there's no good place to
|
| + // initialize it between the time when the AppController is created
|
| + // (where there's no profile) and the time the controller gets another
|
| + // crack at the start of the main event loop. By that time,
|
| + // StartupBrowserCreator has already created the browser window, and it's too
|
| + // late: we need the pref to be already initialized. Doing it here also saves
|
| + // us from having to hard-code pref registration in the several unit tests
|
| + // that use this preference.
|
| + registry->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kHideFullscreenToolbar,
|
| + false,
|
| + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| +#else
|
| registry->RegisterBooleanPref(prefs::kFullscreenAllowed, true);
|
| #endif
|
| }
|
|
|