ui/views/controls/menu/menu_model_adapter.cc - Issue 250943008: Move enum MenuAnchorPosition to reduce deps on menu_item_view.h

Side by Side Diff

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

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

Side by Side Diff: ui/views/controls/menu/menu_model_adapter.cc

Issue 250943008: Move enum MenuAnchorPosition to reduce deps on menu_item_view.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: another rebase for r267046 conflict 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:

View unified diff | Download patch | Annotate | Revision Log

« content/shell/browser/shell_views.cc ('K') | « ui/views/controls/menu/menu_message_pump_dispatcher_win.cc ('k') | ui/views/controls/menu/menu_runner.h » ('j') | ui/views/controls/menu/menu_types.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ui/views/controls/menu/menu_model_adapter.h"	5 #include "ui/views/controls/menu/menu_model_adapter.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "ui/base/l10n/l10n_util.h"	8 #include "ui/base/l10n/l10n_util.h"

9 #include "ui/base/models/menu_model.h"	9 #include "ui/base/models/menu_model.h"

10 #include "ui/gfx/image/image.h"	10 #include "ui/gfx/image/image.h"

	11 #include "ui/views/controls/menu/menu_item_view.h"

11 #include "ui/views/controls/menu/submenu_view.h"	12 #include "ui/views/controls/menu/submenu_view.h"

12 #include "ui/views/views_delegate.h"	13 #include "ui/views/views_delegate.h"

13	14

14 namespace views {	15 namespace views {

15	16

16 MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model)	17 MenuModelAdapter::MenuModelAdapter(ui::MenuModel* menu_model)

17 : menu_model_(menu_model),	18 : menu_model_(menu_model),

18 triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON \|	19 triggerable_event_flags_(ui::EF_LEFT_MOUSE_BUTTON \|

19 ui::EF_RIGHT_MOUSE_BUTTON) {	20 ui::EF_RIGHT_MOUSE_BUTTON) {

20 DCHECK(menu_model);	21 DCHECK(menu_model);

(...skipping 255 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
276 has_icons = has_icons \|\| item->has_icons();	277 has_icons = has_icons \|\| item->has_icons();

277	278

278 menu_map_[item] = submodel;	279 menu_map_[item] = submodel;

279 }	280 }

280 }	281 }

281	282

282 menu->set_has_icons(has_icons);	283 menu->set_has_icons(has_icons);

283 }	284 }

284	285

285 } // namespace views	286 } // namespace views

OLD	NEW