views/controls/menu/native_menu_win.cc - Issue 5697005: Change SimpleMenuModel on OSX to support dynamic icons

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: views/controls/menu/native_menu_win.cc

Issue 5697005: Change SimpleMenuModel on OSX to support dynamic icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update after merge Created 10 years 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: views/controls/menu/native_menu_win.cc

diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc

index 9993d4eda5e55d7a56f7743949276bb22330a898..3c316399b01bb6b644b3ac9f7a67d83206ecadfd 100644

--- a/views/controls/menu/native_menu_win.cc

+++ b/views/controls/menu/native_menu_win.cc

@@ -372,7 +372,8 @@ void NativeMenuWin::UpdateStates() {

int menu_index = model_index + first_item_index_;

SetMenuItemState(menu_index, model_->IsEnabledAt(model_index),

model_->IsItemCheckedAt(model_index), false);

- if (model_->IsLabelDynamicAt(model_index)) {

+ if (model_->IsItemDynamicAt(model_index)) {

+ // TODO(atwilson): Update the icon as well (http://crbug.com/66508).

SetMenuItemLabel(menu_index, model_index,

model_->GetLabelAt(model_index));

}

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