summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 23:04:48 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 23:04:48 +0000
commit294a6fa775b0a49fb020e3365474ee5d72f49adb (patch)
tree52bd06781d47aa50fa28f53e00574a3fb64f7a5d /chrome/common
parent058dfa9b660392eae64be39bc3df4a5a37bedf7c (diff)
downloadchromium_src-294a6fa775b0a49fb020e3365474ee5d72f49adb.zip
chromium_src-294a6fa775b0a49fb020e3365474ee5d72f49adb.tar.gz
chromium_src-294a6fa775b0a49fb020e3365474ee5d72f49adb.tar.bz2
Revert 87592 - Re-enable in-browser thumbnailing for Linux and Chrome OS.
The in-browser thumbnailing does not work if --force-compositing-mode is supplied. I don't know what would be the right way to fix this. For now, we should just disable the in-browser thumbnailing, until we have the right fix. BUG=chromium-os:19731 The last valgrind error was fixed by r87590. BUG=65936 TEST=confirm that thumbnails in the new tab page are updated properly Review URL: http://codereview.chromium.org/6969091 TBR=satorux@chromium.org Review URL: http://codereview.chromium.org/7762006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index d0cd0fd..519577d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1238,13 +1238,8 @@ bool IsPrintPreviewEnabled() {
}
bool IsInBrowserThumbnailingEnabled() {
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
- // The in-browser-thumbnailing is enabled for Linux and Chrome OS.
- return true;
-#else
return CommandLine::ForCurrentProcess()->HasSwitch(
kEnableInBrowserThumbnailing);
-#endif
}
// -----------------------------------------------------------------------------