chrome/browser/ui/views/bookmark_menu_controller_views.h - Issue 6312156: Change includes of gfx/* to ui/gfx/*

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/ui/views/bookmark_menu_controller_views.h

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_

6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_	6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_

7 #pragma once	7 #pragma once

8	8

9 #include <map>	9 #include <map>

10 #include <set>	10 #include <set>

11	11

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

13 #include "chrome/browser/bookmarks/bookmark_node_data.h"	13 #include "chrome/browser/bookmarks/bookmark_node_data.h"

14 #include "chrome/browser/ui/views/bookmark_context_menu.h"	14 #include "chrome/browser/ui/views/bookmark_context_menu.h"

15 #include "gfx/native_widget_types.h"	15 #include "ui/gfx/native_widget_types.h"

16 #include "views/controls/menu/menu_delegate.h"	16 #include "views/controls/menu/menu_delegate.h"

17 #include "views/controls/menu/menu_item_view.h"	17 #include "views/controls/menu/menu_item_view.h"

18	18

19 class BookmarkBarView;	19 class BookmarkBarView;

20 class BookmarkContextMenu;	20 class BookmarkContextMenu;

21 class BookmarkNode;	21 class BookmarkNode;

22 class Browser;	22 class Browser;

23 class PageNavigator;	23 class PageNavigator;

24 class Profile;	24 class Profile;

25	25

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
197 typedef std::map<const BookmarkNode, views::MenuItemView> NodeToMenuMap;	197 typedef std::map<const BookmarkNode, views::MenuItemView> NodeToMenuMap;

198 NodeToMenuMap node_to_menu_map_;	198 NodeToMenuMap node_to_menu_map_;

199	199

200 // ID of the next menu item.	200 // ID of the next menu item.

201 int next_menu_id_;	201 int next_menu_id_;

202	202

203 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);	203 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);

204 };	204 };

205	205

206 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_	206 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_

OLD	NEW