chrome/browser/chromeos/views/native_menu_domui.cc - Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4].

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: chrome/browser/chromeos/views/native_menu_domui.cc

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "chrome/browser/chromeos/views/native_menu_domui.h"	5 #include "chrome/browser/chromeos/views/native_menu_domui.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "app/menus/menu_model.h"	9 #include "app/menus/menu_model.h"

10 #include "base/message_loop.h"	10 #include "base/message_loop.h"

11 #include "base/string_util.h"	11 #include "base/string_util.h"

12 #include "chrome/browser/browser.h"

13 #include "chrome/browser/browser_list.h"

14 #include "chrome/browser/browser_window.h"

15 #include "chrome/browser/chromeos/dom_ui/menu_ui.h"	12 #include "chrome/browser/chromeos/dom_ui/menu_ui.h"

16 #include "chrome/browser/chromeos/views/domui_menu_widget.h"	13 #include "chrome/browser/chromeos/views/domui_menu_widget.h"

17 #include "chrome/browser/chromeos/views/menu_locator.h"	14 #include "chrome/browser/chromeos/views/menu_locator.h"

18 #include "chrome/browser/profile_manager.h"	15 #include "chrome/browser/profile_manager.h"

	16 #include "chrome/browser/ui/browser.h"

	17 #include "chrome/browser/ui/browser_list.h"

	18 #include "chrome/browser/ui/browser_window.h"

19 #include "chrome/common/url_constants.h"	19 #include "chrome/common/url_constants.h"

20 #include "gfx/rect.h"	20 #include "gfx/rect.h"

21 #include "views/controls/menu/menu_2.h"	21 #include "views/controls/menu/menu_2.h"

22 #include "views/controls/menu/native_menu_gtk.h"	22 #include "views/controls/menu/native_menu_gtk.h"

23 #include "views/controls/menu/nested_dispatcher_gtk.h"	23 #include "views/controls/menu/nested_dispatcher_gtk.h"

24	24

25 #if defined(TOUCH_UI)	25 #if defined(TOUCH_UI)

26 #include "views/focus/accelerator_handler.h"	26 #include "views/focus/accelerator_handler.h"

27 #endif	27 #endif

28	28

(...skipping 375 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
404 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {	404 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {

405 menus::MenuModel* model = menu->model();	405 menus::MenuModel* model = menu->model();

406 if (chromeos::MenuUI::IsEnabled()) {	406 if (chromeos::MenuUI::IsEnabled()) {

407 return new chromeos::NativeMenuDOMUI(model, true);	407 return new chromeos::NativeMenuDOMUI(model, true);

408 } else {	408 } else {

409 return new NativeMenuGtk(menu);	409 return new NativeMenuGtk(menu);

410 }	410 }

411 }	411 }

412	412

413 } // namespace views	413 } // namespace views

OLD	NEW

« no previous file with comments | « chrome/browser/chromeos/usb_mount_observer.cc ('k') | chrome/browser/chromeos/wm_overview_controller.cc » ('j') | no next file with comments »