| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 1985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1996 prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false); | 1996 prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false); |
| 1997 } | 1997 } |
| 1998 | 1998 |
| 1999 // static | 1999 // static |
| 2000 void Browser::RegisterPrefs(PrefService* prefs) { | 2000 void Browser::RegisterPrefs(PrefService* prefs) { |
| 2001 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); | 2001 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); |
| 2002 prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); | 2002 prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); |
| 2003 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1); | 2003 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1); |
| 2004 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement); | 2004 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement); |
| 2005 prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1); | 2005 prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1); |
| 2006 // Educated guess: Chrome has a bundled Flash version supporting |
| 2007 // clearing LSO data, Chromium hasn't. |
| 2008 #if defined(GOOGLE_CHROME_BUILD) |
| 2009 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true); |
| 2010 #else |
| 2011 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, false); |
| 2012 #endif |
| 2006 } | 2013 } |
| 2007 | 2014 |
| 2008 // static | 2015 // static |
| 2009 void Browser::RegisterUserPrefs(PrefService* prefs) { | 2016 void Browser::RegisterUserPrefs(PrefService* prefs) { |
| 2010 prefs->RegisterStringPref(prefs::kHomePage, | 2017 prefs->RegisterStringPref(prefs::kHomePage, |
| 2011 chrome::kChromeUINewTabURL); | 2018 chrome::kChromeUINewTabURL); |
| 2012 prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true); | 2019 prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true); |
| 2013 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false); | 2020 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false); |
| 2014 prefs->RegisterBooleanPref(prefs::kShowHomeButton, false); | 2021 prefs->RegisterBooleanPref(prefs::kShowHomeButton, false); |
| 2015 #if defined(OS_MACOSX) | 2022 #if defined(OS_MACOSX) |
| 2016 // This really belongs in platform code, but there's no good place to | 2023 // This really belongs in platform code, but there's no good place to |
| 2017 // initialize it between the time when the AppController is created | 2024 // initialize it between the time when the AppController is created |
| 2018 // (where there's no profile) and the time the controller gets another | 2025 // (where there's no profile) and the time the controller gets another |
| 2019 // crack at the start of the main event loop. By that time, BrowserInit | 2026 // crack at the start of the main event loop. By that time, BrowserInit |
| 2020 // has already created the browser window, and it's too late: we need the | 2027 // has already created the browser window, and it's too late: we need the |
| 2021 // pref to be already initialized. Doing it here also saves us from having | 2028 // pref to be already initialized. Doing it here also saves us from having |
| 2022 // to hard-code pref registration in the several unit tests that use | 2029 // to hard-code pref registration in the several unit tests that use |
| 2023 // this preference. | 2030 // this preference. |
| 2024 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); | 2031 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); |
| 2025 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true); | 2032 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true); |
| 2026 #endif | 2033 #endif |
| 2027 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, ""); | 2034 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, ""); |
| 2028 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); | 2035 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); |
| 2029 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); | 2036 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); |
| 2030 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); | 2037 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); |
| 2031 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); | 2038 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); |
| 2032 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); | 2039 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); |
| 2033 prefs->RegisterBooleanPref(prefs::kDeleteFormData, false); | 2040 prefs->RegisterBooleanPref(prefs::kDeleteFormData, false); |
| 2041 prefs->RegisterBooleanPref(prefs::kDeleteLSOData, false); |
| 2034 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); | 2042 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); |
| 2035 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); | 2043 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); |
| 2036 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 2044 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
| 2037 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 2045 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
| 2038 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 2046 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
| 2039 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 2047 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
| 2040 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2048 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
| 2041 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2049 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
| 2042 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2050 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
| 2043 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2051 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
| (...skipping 2116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4160 return false; | 4168 return false; |
| 4161 } | 4169 } |
| 4162 | 4170 |
| 4163 void Browser::CreateInstantIfNecessary() { | 4171 void Browser::CreateInstantIfNecessary() { |
| 4164 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4172 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
| 4165 !profile()->IsOffTheRecord()) { | 4173 !profile()->IsOffTheRecord()) { |
| 4166 instant_.reset(new InstantController(profile_, this)); | 4174 instant_.reset(new InstantController(profile_, this)); |
| 4167 instant_unload_handler_.reset(new InstantUnloadHandler(this)); | 4175 instant_unload_handler_.reset(new InstantUnloadHandler(this)); |
| 4168 } | 4176 } |
| 4169 } | 4177 } |
| OLD | NEW |