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

Side by Side Diff: ui/views/controls/menu/menu_controller_unittest.cc

Issue 2461493002: Moves DragDropClient to aura/client (Closed)
Patch Set: Created 4 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/callback.h" 7 #include "base/callback.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 14 matching lines...) Expand all
25 #include "ui/views/controls/menu/menu_delegate.h" 25 #include "ui/views/controls/menu/menu_delegate.h"
26 #include "ui/views/controls/menu/menu_host.h" 26 #include "ui/views/controls/menu/menu_host.h"
27 #include "ui/views/controls/menu/menu_item_view.h" 27 #include "ui/views/controls/menu/menu_item_view.h"
28 #include "ui/views/controls/menu/menu_message_loop.h" 28 #include "ui/views/controls/menu/menu_message_loop.h"
29 #include "ui/views/controls/menu/menu_scroll_view_container.h" 29 #include "ui/views/controls/menu/menu_scroll_view_container.h"
30 #include "ui/views/controls/menu/submenu_view.h" 30 #include "ui/views/controls/menu/submenu_view.h"
31 #include "ui/views/test/menu_test_utils.h" 31 #include "ui/views/test/menu_test_utils.h"
32 #include "ui/views/test/views_test_base.h" 32 #include "ui/views/test/views_test_base.h"
33 33
34 #if defined(USE_AURA) 34 #if defined(USE_AURA)
35 #include "ui/aura/client/drag_drop_client.h"
35 #include "ui/aura/scoped_window_targeter.h" 36 #include "ui/aura/scoped_window_targeter.h"
36 #include "ui/aura/window.h" 37 #include "ui/aura/window.h"
37 #include "ui/views/controls/menu/menu_pre_target_handler.h" 38 #include "ui/views/controls/menu/menu_pre_target_handler.h"
38 #include "ui/wm/public/drag_drop_client.h"
39 #endif 39 #endif
40 40
41 #if defined(USE_X11) 41 #if defined(USE_X11)
42 #include <X11/Xlib.h> 42 #include <X11/Xlib.h>
43 #undef Bool 43 #undef Bool
44 #undef None 44 #undef None
45 #include "ui/events/test/events_test_utils_x11.h" 45 #include "ui/events/test/events_test_utils_x11.h"
46 #endif 46 #endif
47 47
48 namespace views { 48 namespace views {
(...skipping 1418 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 aura::client::SetDragDropClient(owner()->GetNativeWindow()->GetRootWindow(), 1467 aura::client::SetDragDropClient(owner()->GetNativeWindow()->GetRootWindow(),
1468 &drag_drop_client); 1468 &drag_drop_client);
1469 AddButtonMenuItems(); 1469 AddButtonMenuItems();
1470 StartDrag(); 1470 StartDrag();
1471 } 1471 }
1472 1472
1473 #endif // defined(USE_AURA) 1473 #endif // defined(USE_AURA)
1474 1474
1475 } // namespace test 1475 } // namespace test
1476 } // namespace views 1476 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/menu/menu_message_loop_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698