diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 23:56:09 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 23:56:09 +0000 |
| commit | 9bd6dea63d941d24cec3197f44361e49a396d759 (patch) | |
| tree | a991857f16b20844a60b7f0d5ba588216ffc6569 /chrome/browser/views | |
| parent | cd500f7a396b38b317c48fd7a8445ee81f1741ed (diff) | |
| download | chromium_src-9bd6dea63d941d24cec3197f44361e49a396d759.zip chromium_src-9bd6dea63d941d24cec3197f44361e49a396d759.tar.gz chromium_src-9bd6dea63d941d24cec3197f44361e49a396d759.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/toolbar_view.cc | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index caca13a..4e7b411 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -1182,7 +1182,10 @@ void BrowserView::ShowPageInfo(Profile* profile, } void BrowserView::ShowPageMenu() { - toolbar_->page_menu()->Activate(); + // TODO(sky): get rid of this and bindings if we decide to keep the new merged + // menu. + if (toolbar_->page_menu()) + toolbar_->page_menu()->Activate(); } void BrowserView::ShowAppMenu() { 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) { |