summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 08:20:38 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 08:20:38 +0000
commit9ab5f9de3e30333ed751492f370f81fb1f64b074 (patch)
treeb9b8b4cfee559c9159cdee7faccdf5e05bbfad17 /chrome/common
parent50cd994072d4156e2fb1fafa948e58baf49b6f75 (diff)
downloadchromium_src-9ab5f9de3e30333ed751492f370f81fb1f64b074.zip
chromium_src-9ab5f9de3e30333ed751492f370f81fb1f64b074.tar.gz
chromium_src-9ab5f9de3e30333ed751492f370f81fb1f64b074.tar.bz2
GTK: Final experiment with Unity Global Menus before I give up on icons.
If you previously had issues with bad lag on Ubuntu Natty, please try this build with the command line flag "--enable-icons-in-global-history-menu". If this both lets icons be in the history menu and makes chrome startup instant, we can roll this out by default. Revert my patch that just removed icons all together and insert some defensive coding to check the output of the favicon database. If an icon is larger than 128 pixels, assume corruption and fallback to the default icon. If it's larger than 16x16, resize it down to 16x16. This reverts commit 8e01e5a72bfe1e9793f5e7986e984ec7c146c445 (r91615). BUG=86715 TEST=none Review URL: http://codereview.chromium.org/7486003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc5
-rw-r--r--chrome/common/chrome_switches.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 14d3941..95d4831 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1169,6 +1169,11 @@ const char kKioskMode[] = "kiosk";
// minute because it doesn't like it when we thrown hundreds of kilobytes (or
// even megabytes) of favicon data at it.
const char kEnableGlobalBookmarkMenu[] = "enable-global-bookmark-menu";
+
+// An experiment to see if it's corrupted favicon data that's making unity
+// global menu bar startup slow.
+const char kEnableIconsInGlobalHistoryMenu[] =
+ "enable-icons-in-global-history-menu";
#endif
#if defined(TOOLKIT_VIEWS)
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 3d9aebf..54b36a2 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -339,6 +339,7 @@ extern const char kKioskMode[];
#if defined(TOOLKIT_GTK)
extern const char kEnableGlobalBookmarkMenu[];
+extern const char kEnableIconsInGlobalHistoryMenu[];
#endif
#if defined(TOOLKIT_VIEWS)