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 #include "ui/views/controls/menu/menu_controller.h" | 5 #include "ui/views/controls/menu/menu_controller.h" |
6 | 6 |
7 #include "base/i18n/case_conversion.h" | 7 #include "base/i18n/case_conversion.h" |
8 #include "base/i18n/rtl.h" | 8 #include "base/i18n/rtl.h" |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 11 #include "ui/base/dragdrop/drag_utils.h" |
11 #include "ui/base/dragdrop/os_exchange_data.h" | 12 #include "ui/base/dragdrop/os_exchange_data.h" |
12 #include "ui/base/events.h" | 13 #include "ui/base/events.h" |
13 #include "ui/base/keycodes/keyboard_codes.h" | 14 #include "ui/base/keycodes/keyboard_codes.h" |
14 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" |
15 #include "ui/gfx/canvas_skia.h" | 16 #include "ui/gfx/canvas_skia.h" |
16 #include "ui/gfx/screen.h" | 17 #include "ui/gfx/screen.h" |
17 #include "ui/views/controls/button/menu_button.h" | 18 #include "ui/views/controls/button/menu_button.h" |
18 #include "ui/views/controls/menu/menu_controller_delegate.h" | 19 #include "ui/views/controls/menu/menu_controller_delegate.h" |
19 #include "ui/views/controls/menu/menu_scroll_view_container.h" | 20 #include "ui/views/controls/menu/menu_scroll_view_container.h" |
20 #include "ui/views/controls/menu/submenu_view.h" | 21 #include "ui/views/controls/menu/submenu_view.h" |
21 #include "ui/views/drag_utils.h" | |
22 #include "ui/views/view_constants.h" | 22 #include "ui/views/view_constants.h" |
23 #include "ui/views/views_delegate.h" | 23 #include "ui/views/views_delegate.h" |
24 #include "ui/views/widget/root_view.h" | 24 #include "ui/views/widget/root_view.h" |
25 #include "ui/views/widget/widget.h" | 25 #include "ui/views/widget/widget.h" |
26 | 26 |
27 #if defined(USE_AURA) | 27 #if defined(USE_AURA) |
28 #include "ui/aura/client/dispatcher_client.h" | 28 #include "ui/aura/client/dispatcher_client.h" |
29 #include "ui/aura/env.h" | 29 #include "ui/aura/env.h" |
30 #include "ui/aura/root_window.h" | 30 #include "ui/aura/root_window.h" |
31 #elif defined(TOOLKIT_USES_GTK) | 31 #elif defined(TOOLKIT_USES_GTK) |
(...skipping 2015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2047 (!pending_state_.item->HasSubmenu() || | 2047 (!pending_state_.item->HasSubmenu() || |
2048 !pending_state_.item->GetSubmenu()->IsShowing())) { | 2048 !pending_state_.item->GetSubmenu()->IsShowing())) { |
2049 // On exit if the user hasn't selected an item with a submenu, move the | 2049 // On exit if the user hasn't selected an item with a submenu, move the |
2050 // selection back to the parent menu item. | 2050 // selection back to the parent menu item. |
2051 SetSelection(pending_state_.item->GetParentMenuItem(), | 2051 SetSelection(pending_state_.item->GetParentMenuItem(), |
2052 SELECTION_OPEN_SUBMENU); | 2052 SELECTION_OPEN_SUBMENU); |
2053 } | 2053 } |
2054 } | 2054 } |
2055 | 2055 |
2056 } // namespace views | 2056 } // namespace views |
OLD | NEW |