| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index 24f7c6fe93ddce7398eace9155dd522f40c730c3..8a9020b8393f38ec9aa77a49d9ffbb8797d396c1 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -1985,6 +1985,13 @@ void Browser::RegisterPrefs(PrefService* prefs) {
|
| prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1);
|
| prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement);
|
| prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1);
|
| + // Educated guess: Chrome has a bundled Flash version supporting
|
| + // clearing LSO data, Chromium hasn't.
|
| +#if defined(GOOGLE_CHROME_BUILD)
|
| + prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true);
|
| +#else
|
| + prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, false);
|
| +#endif
|
| }
|
|
|
| // static
|
| @@ -1993,6 +2000,7 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
|
| chrome::kChromeUINewTabURL);
|
| prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true);
|
| prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false);
|
| + prefs->RegisterBooleanPref(prefs::kClearPluginLSODataOnExit, false);
|
| prefs->RegisterBooleanPref(prefs::kShowHomeButton, false);
|
| #if defined(OS_MACOSX)
|
| // This really belongs in platform code, but there's no good place to
|
| @@ -2013,6 +2021,7 @@ void Browser::RegisterUserPrefs(PrefService* prefs) {
|
| prefs->RegisterBooleanPref(prefs::kDeleteCookies, true);
|
| prefs->RegisterBooleanPref(prefs::kDeletePasswords, false);
|
| prefs->RegisterBooleanPref(prefs::kDeleteFormData, false);
|
| + prefs->RegisterBooleanPref(prefs::kDeleteLSOData, false);
|
| prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0);
|
| prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true);
|
| prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true);
|
|
|