| 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 #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 | 10 |
| 11 #if defined(OS_WIN) | 11 #if defined(OS_WIN) |
| 12 #include <windows.h> | 12 #include <windows.h> |
| 13 #endif | 13 #endif |
| 14 | 14 |
| 15 // TODO(avi): remove when not needed | 15 // TODO(avi): remove when not needed |
| 16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
| 17 #include "third_party/skia/include/core/SkBitmap.h" | 17 #include "third_party/skia/include/core/SkBitmap.h" |
| 18 #include "views/view.h" | 18 #include "views/view.h" |
| 19 | 19 |
| 20 #if defined(OS_WIN) | 20 #if defined(OS_WIN) |
| 21 #include "gfx/native_theme_win.h" | 21 #include "ui/gfx/native_theme_win.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 namespace ui { | 24 namespace ui { |
| 25 class MenuModel; | 25 class MenuModel; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace views { | 28 namespace views { |
| 29 | 29 |
| 30 class MenuButton; | 30 class MenuButton; |
| 31 class MenuController; | 31 class MenuController; |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 | 411 |
| 412 // Preferred height of menu items. Reset every time a menu is run. | 412 // Preferred height of menu items. Reset every time a menu is run. |
| 413 static int pref_menu_height_; | 413 static int pref_menu_height_; |
| 414 | 414 |
| 415 DISALLOW_COPY_AND_ASSIGN(MenuItemView); | 415 DISALLOW_COPY_AND_ASSIGN(MenuItemView); |
| 416 }; | 416 }; |
| 417 | 417 |
| 418 } // namespace views | 418 } // namespace views |
| 419 | 419 |
| 420 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ | 420 #endif // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ |
| OLD | NEW |