summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 21:53:52 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-22 21:53:52 +0000
commit2df4a3857876b0a0f45c57f1fe8e7a29b48fd248 (patch)
treeb06568a4187490649f199cc7b4318ba5b23e48b6 /chrome/browser/views
parentd4fa01ce3bc4264775acedd804e44738d3030084 (diff)
downloadchromium_src-2df4a3857876b0a0f45c57f1fe8e7a29b48fd248.zip
chromium_src-2df4a3857876b0a0f45c57f1fe8e7a29b48fd248.tar.gz
chromium_src-2df4a3857876b0a0f45c57f1fe8e7a29b48fd248.tar.bz2
TBR: Fix dead tree.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/frame/browser_view.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index d01ee94..8aa44b6 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1402,8 +1402,11 @@ void BrowserView::Init() {
status_bubble_.reset(new StatusBubbleViews(GetWidget()));
- extension_shelf_ = new ExtensionShelf(browser_.get());
- AddChildView(extension_shelf_);
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableExtensions)) {
+ extension_shelf_ = new ExtensionShelf(browser_.get());
+ AddChildView(extension_shelf_);
+ }
#if defined(OS_WIN)
InitSystemMenu();