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 #include "views/controls/menu/menu_item_view.h" | 5 #include "views/controls/menu/menu_item_view.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "gfx/canvas.h" | |
9 #include "grit/app_strings.h" | 8 #include "grit/app_strings.h" |
10 #include "ui/base/l10n/l10n_util.h" | 9 #include "ui/base/l10n/l10n_util.h" |
11 #include "ui/base/models/menu_model.h" | 10 #include "ui/base/models/menu_model.h" |
| 11 #include "ui/gfx/canvas.h" |
12 #include "views/controls/button/text_button.h" | 12 #include "views/controls/button/text_button.h" |
13 #include "views/controls/button/menu_button.h" | 13 #include "views/controls/button/menu_button.h" |
14 #include "views/controls/menu/menu_config.h" | 14 #include "views/controls/menu/menu_config.h" |
15 #include "views/controls/menu/menu_controller.h" | 15 #include "views/controls/menu/menu_controller.h" |
16 #include "views/controls/menu/menu_separator.h" | 16 #include "views/controls/menu/menu_separator.h" |
17 #include "views/controls/menu/submenu_view.h" | 17 #include "views/controls/menu/submenu_view.h" |
18 | 18 |
19 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
20 #include "base/win/win_util.h" | 20 #include "base/win/win_util.h" |
21 #endif | 21 #endif |
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 } | 671 } |
672 | 672 |
673 string16 MenuItemView::GetAcceleratorText() { | 673 string16 MenuItemView::GetAcceleratorText() { |
674 Accelerator accelerator; | 674 Accelerator accelerator; |
675 return (GetDelegate() && | 675 return (GetDelegate() && |
676 GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ? | 676 GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ? |
677 accelerator.GetShortcutText() : string16(); | 677 accelerator.GetShortcutText() : string16(); |
678 } | 678 } |
679 | 679 |
680 } // namespace views | 680 } // namespace views |
OLD | NEW |