chrome/browser/views/toolbar_view.cc - Issue 2867029: Fixes new wrench related problems on views:

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/views/toolbar_view.cc

Issue 2867029: Fixes new wrench related problems on views: (Closed)

Patch Set: Created 10 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/views/toolbar_view.cc

diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc

index e7849701513f08fc3d217e3fb54b23fbd4a6cec8..ddc4768d6d2b80e689e52253b2b8e854f79304df 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) {

« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/wrench_menu_model.cc » ('j') | no next file with comments »