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

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

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « ui/views/controls/menu/menu_config_win.cc ('k') | ui/views/controls/menu/menu_item_view.cc » ('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) 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 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
6 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 6 #define UI_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 "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/string16.h" 14 #include "base/string16.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "third_party/skia/include/core/SkBitmap.h" 16 #include "third_party/skia/include/core/SkBitmap.h"
17 #include "ui/views/view.h" 17 #include "ui/views/view.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include <windows.h> 20 #include <windows.h>
21 21
22 #include "ui/base/native_theme/native_theme.h" 22 #include "ui/gfx/native_theme.h"
23 #endif 23 #endif
24 24
25 namespace gfx { 25 namespace gfx {
26 class Font; 26 class Font;
27 } 27 }
28 28
29 namespace ui { 29 namespace ui {
30 class MenuModel; 30 class MenuModel;
31 } 31 }
32 32
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 // Actual paint implementation. If mode is PB_FOR_DRAG, portions of the menu 355 // Actual paint implementation. If mode is PB_FOR_DRAG, portions of the menu
356 // are not rendered. 356 // are not rendered.
357 enum PaintButtonMode { PB_NORMAL, PB_FOR_DRAG }; 357 enum PaintButtonMode { PB_NORMAL, PB_FOR_DRAG };
358 void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode); 358 void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode);
359 359
360 #if defined(OS_WIN) 360 #if defined(OS_WIN)
361 enum SelectionState { SELECTED, UNSELECTED }; 361 enum SelectionState { SELECTED, UNSELECTED };
362 362
363 // Paints the check/radio button indicator. 363 // Paints the check/radio button indicator.
364 void PaintCheck(gfx::Canvas* canvas, 364 void PaintCheck(gfx::Canvas* canvas,
365 ui::NativeTheme::State state, 365 gfx::NativeTheme::State state,
366 SelectionState selection_state, 366 SelectionState selection_state,
367 const MenuConfig& config); 367 const MenuConfig& config);
368 #endif 368 #endif
369 369
370 // Paints the accelerator. 370 // Paints the accelerator.
371 void PaintAccelerator(gfx::Canvas* canvas); 371 void PaintAccelerator(gfx::Canvas* canvas);
372 372
373 // Destroys the window used to display this menu and recursively destroys 373 // Destroys the window used to display this menu and recursively destroys
374 // the windows used to display all descendants. 374 // the windows used to display all descendants.
375 void DestroyAllMenuHosts(); 375 void DestroyAllMenuHosts();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 // position of the menu being shown. 470 // position of the menu being shown.
471 MenuPosition requested_menu_position_; 471 MenuPosition requested_menu_position_;
472 MenuPosition actual_menu_position_; 472 MenuPosition actual_menu_position_;
473 473
474 DISALLOW_COPY_AND_ASSIGN(MenuItemView); 474 DISALLOW_COPY_AND_ASSIGN(MenuItemView);
475 }; 475 };
476 476
477 } // namespace views 477 } // namespace views
478 478
479 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ 479 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_config_win.cc ('k') | ui/views/controls/menu/menu_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698