From 9bd6dea63d941d24cec3197f44361e49a396d759 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Fri, 25 Jun 2010 23:56:09 +0000 Subject: Fixes new wrench related problems on views: . crash when showing page menu via alt-e. . dchecks when running on views on linux. BUG=45734 TEST=none TBR=erg@chromium.org Review URL: http://codereview.chromium.org/2867029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50911 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/toolbar_view.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/views/toolbar_view.cc') diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index e784970..ddc4768d 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -230,7 +230,8 @@ void ToolbarView::Update(TabContents* tab, bool should_restore_state) { void ToolbarView::SetAppMenuModel(menus::SimpleMenuModel* model) { app_menu_model_.reset(model); - app_menu_menu_.reset(new views::Menu2(app_menu_model_.get())); + if (!WrenchMenuModel::IsEnabled()) + app_menu_menu_.reset(new views::Menu2(app_menu_model_.get())); } void ToolbarView::SetToolbarFocusAndFocusLocationBar(int view_storage_id) { -- cgit v1.1