| OLD | NEW |
| 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 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
| 14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 15 #include "ui/base/models/menu_separator_types.h" | 15 #include "ui/base/models/menu_separator_types.h" |
| 16 #include "ui/gfx/image/image_skia.h" | 16 #include "ui/gfx/image/image_skia.h" |
| 17 #include "ui/views/controls/menu/menu_config.h" | 17 #include "ui/views/controls/menu/menu_config.h" |
| 18 #include "ui/views/controls/menu/menu_runner.h" |
| 18 #include "ui/views/view.h" | 19 #include "ui/views/view.h" |
| 19 | 20 |
| 20 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| 21 #include <windows.h> | 22 #include <windows.h> |
| 22 | 23 |
| 23 #include "ui/native_theme/native_theme.h" | 24 #include "ui/native_theme/native_theme.h" |
| 24 #endif | 25 #endif |
| 25 | 26 |
| 26 namespace gfx { | 27 namespace gfx { |
| 27 class FontList; | 28 class FontList; |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 MenuPosition requested_menu_position_; | 523 MenuPosition requested_menu_position_; |
| 523 MenuPosition actual_menu_position_; | 524 MenuPosition actual_menu_position_; |
| 524 | 525 |
| 525 // If set to false, the right margin will be removed for menu lines | 526 // If set to false, the right margin will be removed for menu lines |
| 526 // containing other elements. | 527 // containing other elements. |
| 527 bool use_right_margin_; | 528 bool use_right_margin_; |
| 528 | 529 |
| 529 DISALLOW_COPY_AND_ASSIGN(MenuItemView); | 530 DISALLOW_COPY_AND_ASSIGN(MenuItemView); |
| 530 }; | 531 }; |
| 531 | 532 |
| 533 template<> VIEWS_EXPORT |
| 534 MenuRunner::RunResult MenuRunner::RunMenuAt(Widget* parent, |
| 535 MenuButton* button, |
| 536 const gfx::Rect& bounds, |
| 537 MenuItemView::AnchorPosition anchor, |
| 538 ui::MenuSourceType source_type, |
| 539 int32 types) WARN_UNUSED_RESULT; |
| 540 |
| 532 } // namespace views | 541 } // namespace views |
| 533 | 542 |
| 534 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ | 543 #endif // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_ |
| OLD | NEW |