ui/views/controls/menu/menu_model_adapter.cc - Issue 273223002: views: Make view::Views::GetPreferredSize() const.

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More compile fix for ToT Created 6 years, 7 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: ui/views/controls/menu/menu_model_adapter.cc

diff --git a/ui/views/controls/menu/menu_model_adapter.cc b/ui/views/controls/menu/menu_model_adapter.cc

index 51edb035fea16121ad7dcd488d40c8ae8b2a3146..18c426996eb7cd2304c81e90cbeb471f63faf56b 100644

--- a/ui/views/controls/menu/menu_model_adapter.cc

+++ b/ui/views/controls/menu/menu_model_adapter.cc

@@ -162,7 +162,7 @@ bool MenuModelAdapter::IsTriggerableEvent(MenuItemView* source,

}

bool MenuModelAdapter::GetAccelerator(int id,

- ui::Accelerator* accelerator) {

+ ui::Accelerator* accelerator) const {

ui::MenuModel* model = menu_model_;

int index = 0;

if (ui::MenuModel::GetModelAndIndexForCommandId(id, &model, &index))