Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: views/controls/menu/menu_item_view.h

Issue 8536004: Cleanup: Remove unneeded forward declarations in views. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
« no previous file with comments | « views/controls/menu/menu_host.h ('k') | views/controls/menu/native_menu_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 5 #ifndef VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
6 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 6 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "build/build_config.h"
13
14 #if defined(OS_WIN)
15 #include <windows.h>
16 #endif
17
18 #include "base/logging.h" 12 #include "base/logging.h"
19 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "build/build_config.h"
20 #include "third_party/skia/include/core/SkBitmap.h" 15 #include "third_party/skia/include/core/SkBitmap.h"
21 #include "views/view.h" 16 #include "views/view.h"
22 17
23 #if defined(OS_WIN) 18 #if defined(OS_WIN)
19 #include <windows.h>
20
24 #include "ui/gfx/native_theme.h" 21 #include "ui/gfx/native_theme.h"
25 #endif 22 #endif
26 23
27 namespace gfx { 24 namespace gfx {
28 class Font; 25 class Font;
29 } 26 }
30 27
31 namespace ui { 28 namespace ui {
32 class MenuModel; 29 class MenuModel;
33 } 30 }
34 31
35 namespace views { 32 namespace views {
36 33
37 namespace internal { 34 namespace internal {
38 class MenuRunnerImpl; 35 class MenuRunnerImpl;
39 } 36 }
40 37
41 class MenuButton;
42 struct MenuConfig; 38 struct MenuConfig;
43 class MenuController; 39 class MenuController;
44 class MenuDelegate; 40 class MenuDelegate;
45 class SubmenuView; 41 class SubmenuView;
46 42
47 // MenuItemView -------------------------------------------------------------- 43 // MenuItemView --------------------------------------------------------------
48 44
49 // MenuItemView represents a single menu item with a label and optional icon. 45 // MenuItemView represents a single menu item with a label and optional icon.
50 // Each MenuItemView may also contain a submenu, which in turn may contain 46 // Each MenuItemView may also contain a submenu, which in turn may contain
51 // any number of child MenuItemViews. 47 // any number of child MenuItemViews.
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 // position of the menu being shown. 463 // position of the menu being shown.
468 MenuPosition requested_menu_position_; 464 MenuPosition requested_menu_position_;
469 MenuPosition actual_menu_position_; 465 MenuPosition actual_menu_position_;
470 466
471 DISALLOW_COPY_AND_ASSIGN(MenuItemView); 467 DISALLOW_COPY_AND_ASSIGN(MenuItemView);
472 }; 468 };
473 469
474 } // namespace views 470 } // namespace views
475 471
476 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 472 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
OLDNEW
« no previous file with comments | « views/controls/menu/menu_host.h ('k') | views/controls/menu/native_menu_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698