diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 19:46:57 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 19:46:57 +0000 |
| commit | bbe192b6e32035bae275f798bd495d136a1a1d68 (patch) | |
| tree | 4e094f9446b48dcf01d331b44e298fd807f61fd7 /chrome/common | |
| parent | 145db1f5370109e0abcd324c37424dded8a501df (diff) | |
| download | chromium_src-bbe192b6e32035bae275f798bd495d136a1a1d68.zip chromium_src-bbe192b6e32035bae275f798bd495d136a1a1d68.tar.gz chromium_src-bbe192b6e32035bae275f798bd495d136a1a1d68.tar.bz2 | |
Revert "Replace --top-sites flag with --no-top-sites flag. TopSites becomes the default."
Introduced new crashes.
TBR=nshkrob
Review URL: http://codereview.chromium.org/3026059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 7 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 111dc88..454fffd 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -682,9 +682,6 @@ const char kNoProxyServer[] = "no-proxy-server"; // Runs the renderer outside the sandbox. const char kNoSandbox[] = "no-sandbox"; -// 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"; @@ -945,6 +942,10 @@ const char kTestType[] = "test-type"; // testing-related messages on IPC channel with the given ID. const char kTestingChannelID[] = "testing-channel"; +// Enables using TopSites instead of ThumbnailDatabase (and +// ThumbnailStore) for getting thumbnails for the new tab page. +const char kTopSites[] = "top-sites"; + // Excludes these plugins from the plugin sandbox. // This is a comma-separated list of plugin library names. const char kTrustedPlugins[] = "trusted-plugins"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 1e660dd..cc69770 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -201,7 +201,6 @@ extern const char kNoJsRandomness[]; extern const char kNoProxyServer[]; extern const char kNoReferrers[]; extern const char kNoSandbox[]; -extern const char kNoTopSites[]; extern const char kNumPacThreads[]; extern const char kOpenInNewWindow[]; extern const char kOrganicInstall[]; @@ -270,6 +269,7 @@ extern const char kTestName[]; extern const char kTestSandbox[]; extern const char kTestType[]; extern const char kTestingChannelID[]; +extern const char kTopSites[]; extern const char kTrustedPlugins[]; extern const char kTryChromeAgain[]; extern const char kUninstall[]; |