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 1940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1951 prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false); | 1951 prefs->SetBoolean(prefs::kHomePageIsNewTabPage, false); |
1952 } | 1952 } |
1953 | 1953 |
1954 // static | 1954 // static |
1955 void Browser::RegisterPrefs(PrefService* prefs) { | 1955 void Browser::RegisterPrefs(PrefService* prefs) { |
1956 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); | 1956 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement); |
1957 prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); | 1957 prefs->RegisterIntegerPref(prefs::kOptionsWindowLastTabIndex, 0); |
1958 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1); | 1958 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1); |
1959 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement); | 1959 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement); |
1960 prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1); | 1960 prefs->RegisterIntegerPref(prefs::kExtensionSidebarWidth, -1); |
| 1961 // Educated guess: Chrome has a bundled Flash version supporting |
| 1962 // clearing LSO data, Chromium hasn't. |
| 1963 #if defined(GOOGLE_CHROME_BUILD) |
| 1964 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, true); |
| 1965 #else |
| 1966 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataEnabled, false); |
| 1967 #endif |
1961 } | 1968 } |
1962 | 1969 |
1963 // static | 1970 // static |
1964 void Browser::RegisterUserPrefs(PrefService* prefs) { | 1971 void Browser::RegisterUserPrefs(PrefService* prefs) { |
1965 prefs->RegisterStringPref(prefs::kHomePage, | 1972 prefs->RegisterStringPref(prefs::kHomePage, |
1966 chrome::kChromeUINewTabURL); | 1973 chrome::kChromeUINewTabURL); |
1967 prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true); | 1974 prefs->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true); |
1968 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false); | 1975 prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false); |
| 1976 prefs->RegisterBooleanPref(prefs::kClearPluginLSODataOnExit, false); |
1969 prefs->RegisterBooleanPref(prefs::kShowHomeButton, false); | 1977 prefs->RegisterBooleanPref(prefs::kShowHomeButton, false); |
1970 #if defined(OS_MACOSX) | 1978 #if defined(OS_MACOSX) |
1971 // This really belongs in platform code, but there's no good place to | 1979 // This really belongs in platform code, but there's no good place to |
1972 // initialize it between the time when the AppController is created | 1980 // initialize it between the time when the AppController is created |
1973 // (where there's no profile) and the time the controller gets another | 1981 // (where there's no profile) and the time the controller gets another |
1974 // crack at the start of the main event loop. By that time, BrowserInit | 1982 // crack at the start of the main event loop. By that time, BrowserInit |
1975 // has already created the browser window, and it's too late: we need the | 1983 // has already created the browser window, and it's too late: we need the |
1976 // pref to be already initialized. Doing it here also saves us from having | 1984 // pref to be already initialized. Doing it here also saves us from having |
1977 // to hard-code pref registration in the several unit tests that use | 1985 // to hard-code pref registration in the several unit tests that use |
1978 // this preference. | 1986 // this preference. |
1979 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); | 1987 prefs->RegisterBooleanPref(prefs::kShowPageOptionsButtons, false); |
1980 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true); | 1988 prefs->RegisterBooleanPref(prefs::kShowUpdatePromotionInfoBar, true); |
1981 #endif | 1989 #endif |
1982 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, ""); | 1990 prefs->RegisterStringPref(prefs::kRecentlySelectedEncoding, ""); |
1983 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); | 1991 prefs->RegisterBooleanPref(prefs::kDeleteBrowsingHistory, true); |
1984 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); | 1992 prefs->RegisterBooleanPref(prefs::kDeleteDownloadHistory, true); |
1985 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); | 1993 prefs->RegisterBooleanPref(prefs::kDeleteCache, true); |
1986 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); | 1994 prefs->RegisterBooleanPref(prefs::kDeleteCookies, true); |
1987 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); | 1995 prefs->RegisterBooleanPref(prefs::kDeletePasswords, false); |
1988 prefs->RegisterBooleanPref(prefs::kDeleteFormData, false); | 1996 prefs->RegisterBooleanPref(prefs::kDeleteFormData, false); |
| 1997 prefs->RegisterBooleanPref(prefs::kDeleteLSOData, false); |
1989 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); | 1998 prefs->RegisterIntegerPref(prefs::kDeleteTimePeriod, 0); |
1990 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); | 1999 prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser, true); |
1991 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); | 2000 prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint, true); |
1992 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); | 2001 prefs->RegisterBooleanPref(prefs::kWebAppCreateOnDesktop, true); |
1993 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); | 2002 prefs->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true); |
1994 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); | 2003 prefs->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true); |
1995 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); | 2004 prefs->RegisterBooleanPref(prefs::kUseVerticalTabs, false); |
1996 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); | 2005 prefs->RegisterBooleanPref(prefs::kEnableTranslate, true); |
1997 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); | 2006 prefs->RegisterBooleanPref(prefs::kRemotingHasSetupCompleted, false); |
1998 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); | 2007 prefs->RegisterStringPref(prefs::kCloudPrintEmail, std::string()); |
(...skipping 2078 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4077 NOTREACHED(); | 4086 NOTREACHED(); |
4078 return false; | 4087 return false; |
4079 } | 4088 } |
4080 | 4089 |
4081 void Browser::CreateInstantIfNecessary() { | 4090 void Browser::CreateInstantIfNecessary() { |
4082 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && | 4091 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && |
4083 !profile()->IsOffTheRecord()) { | 4092 !profile()->IsOffTheRecord()) { |
4084 instant_.reset(new InstantController(profile_, this)); | 4093 instant_.reset(new InstantController(profile_, this)); |
4085 } | 4094 } |
4086 } | 4095 } |
OLD | NEW |