summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 03:24:49 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 03:24:49 +0000
commit2ec53b5e7018ed63499e0a4fab557f820b03fc53 (patch)
tree3a38d3a7c52cf844cd1d1cf5867e1af18330397e /chrome/common
parent18d4b6cecb490ffa3dcb53cfad7ca0ad695217c4 (diff)
downloadchromium_src-2ec53b5e7018ed63499e0a4fab557f820b03fc53.zip
chromium_src-2ec53b5e7018ed63499e0a4fab557f820b03fc53.tar.gz
chromium_src-2ec53b5e7018ed63499e0a4fab557f820b03fc53.tar.bz2
Disables top sites until we get it in a better shape.
BUG=40313 TEST=see bug. aocampo has some test cases too. Review URL: http://codereview.chromium.org/3412015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc6
-rw-r--r--chrome/common/chrome_switches.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 5a609ac..fbed4f8 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -522,6 +522,9 @@ const char kEnableSyncTypedUrls[] = "enable-sync-typed-urls";
// Enable tabbed options, ie: dom-ui version of options window.
const char kEnableTabbedOptions[] = "enable-tabbed-options";
+// Enables TopSites.
+const char kEnableTopSites[] = "enable-top-sites";
+
// Whether or not the touch events API is exposed.
const char kEnableTouch[] = "enable-touch";
@@ -775,9 +778,6 @@ const char kNoSandbox[] = "no-sandbox";
// Chrome for the purpose of hosting background apps).
const char kNoStartupWindow[] = "no-startup-window";
-// Don't use TopSites; use old ThumbnailDatabase code instead.
-const char kNoTopSites[] = "no-top-sites";
-
// Specifies the maximum number of threads to use for running the Proxy
// Autoconfig (PAC) script.
const char kNumPacThreads[] = "num-pac-threads";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 984e2d8..5be3d28 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -161,6 +161,7 @@ extern const char kEnableSyncSessions[];
extern const char kEnableSyncThemes[];
extern const char kEnableSyncTypedUrls[];
extern const char kEnableTabbedOptions[];
+extern const char kEnableTopSites[];
extern const char kEnableTouch[];
extern const char kEnableVerticalTabs[];
extern const char kEnableVideoFullscreen[];
@@ -225,7 +226,6 @@ extern const char kNoProxyServer[];
extern const char kNoReferrers[];
extern const char kNoSandbox[];
extern const char kNoStartupWindow[];
-extern const char kNoTopSites[];
extern const char kNumPacThreads[];
extern const char kOpenInNewWindow[];
extern const char kOrganicInstall[];