diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 17:36:49 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 17:36:49 +0000 |
| commit | 86c10a17c5b7fbaa21d39b1f8d69b858a9fce417 (patch) | |
| tree | e79f4da7a12456ed5e342c222d1592633242fdf1 /chrome/browser/extensions | |
| parent | 3374f3ca35055b0bc4abaab15a962a53576fe8fd (diff) | |
| download | chromium_src-86c10a17c5b7fbaa21d39b1f8d69b858a9fce417.zip chromium_src-86c10a17c5b7fbaa21d39b1f8d69b858a9fce417.tar.gz chromium_src-86c10a17c5b7fbaa21d39b1f8d69b858a9fce417.tar.bz2 | |
Remove the extension shelf on Linux.
The extension team's plan is to get rid of extension shelf entirely.
This is also going to fix a crash.
TEST=none
BUG=25106
Review URL: http://codereview.chromium.org/313006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_browsertests_misc.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 10d33c3..e991926 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -15,11 +15,9 @@ #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/tab_contents.h" -#if defined(TOOLKIT_GTK) -#include "chrome/browser/gtk/extension_shelf_gtk.h" -#else +#if defined(TOOLKIT_VIEWS) #include "chrome/browser/views/extensions/extension_shelf.h" -#endif // defined(TOOLKIT_GTK) +#endif #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/chrome_paths.h" |