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

Side by Side Diff: views/controls/menu/menu_controller.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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 | « views/controls/combobox/native_combobox_win.cc ('k') | views/controls/menu/menu_host.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_controller.h" 5 #include "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/os_exchange_data.h" 11 #include "ui/base/dragdrop/os_exchange_data.h"
12 #include "ui/base/events.h" 12 #include "ui/base/events.h"
13 #include "ui/base/keycodes/keyboard_codes.h" 13 #include "ui/base/keycodes/keyboard_codes.h"
14 #include "ui/base/l10n/l10n_util.h" 14 #include "ui/base/l10n/l10n_util.h"
15 #include "ui/gfx/canvas_skia.h" 15 #include "ui/gfx/canvas_skia.h"
16 #include "ui/gfx/screen.h" 16 #include "ui/gfx/screen.h"
17 #include "ui/views/widget/root_view.h"
18 #include "ui/views/widget/widget.h"
17 #include "views/controls/button/menu_button.h" 19 #include "views/controls/button/menu_button.h"
18 #include "views/controls/menu/menu_controller_delegate.h" 20 #include "views/controls/menu/menu_controller_delegate.h"
19 #include "views/controls/menu/menu_scroll_view_container.h" 21 #include "views/controls/menu/menu_scroll_view_container.h"
20 #include "views/controls/menu/submenu_view.h" 22 #include "views/controls/menu/submenu_view.h"
21 #include "views/drag_utils.h" 23 #include "views/drag_utils.h"
22 #include "views/view_constants.h" 24 #include "views/view_constants.h"
23 #include "views/views_delegate.h" 25 #include "views/views_delegate.h"
24 #include "views/widget/root_view.h"
25 #include "views/widget/widget.h"
26 26
27 #if defined(USE_AURA) 27 #if defined(USE_AURA)
28 #include "ui/aura/desktop.h" 28 #include "ui/aura/desktop.h"
29 #endif 29 #endif
30 30
31 #if defined(TOOLKIT_USES_GTK) 31 #if defined(TOOLKIT_USES_GTK)
32 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 32 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
33 #endif 33 #endif
34 34
35 #if defined(TOUCH_UI) 35 #if defined(TOUCH_UI)
(...skipping 1926 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 // is necessary to exit from nested loop (See Dispatch methods). 1962 // is necessary to exit from nested loop (See Dispatch methods).
1963 // Send non-op event so that Dispatch method will always be called. 1963 // Send non-op event so that Dispatch method will always be called.
1964 // crbug.com/104684. 1964 // crbug.com/104684.
1965 if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) 1965 if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED)
1966 aura::Desktop::GetInstance()->PostNativeEvent(ui::CreateNoopEvent()); 1966 aura::Desktop::GetInstance()->PostNativeEvent(ui::CreateNoopEvent());
1967 #endif 1967 #endif
1968 } 1968 }
1969 1969
1970 1970
1971 } // namespace views 1971 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/combobox/native_combobox_win.cc ('k') | views/controls/menu/menu_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698