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

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

Issue 2326933002: MacViews: Fix gn check fail for mac_views_browser on Aura dependencies. (Closed)
Patch Set: Typo. Created 4 years, 3 months 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/macros.h" 8 #include "base/macros.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "ui/aura/scoped_window_targeter.h"
13 #include "ui/aura/window.h"
14 #include "ui/events/event.h" 12 #include "ui/events/event.h"
15 #include "ui/events/event_constants.h" 13 #include "ui/events/event_constants.h"
16 #include "ui/events/event_handler.h" 14 #include "ui/events/event_handler.h"
17 #include "ui/events/event_utils.h" 15 #include "ui/events/event_utils.h"
18 #include "ui/events/null_event_targeter.h" 16 #include "ui/events/null_event_targeter.h"
19 #include "ui/events/test/event_generator.h" 17 #include "ui/events/test/event_generator.h"
20 #include "ui/gfx/geometry/point.h" 18 #include "ui/gfx/geometry/point.h"
21 #include "ui/gfx/geometry/rect.h" 19 #include "ui/gfx/geometry/rect.h"
22 #include "ui/views/controls/menu/menu_controller_delegate.h" 20 #include "ui/views/controls/menu/menu_controller_delegate.h"
23 #include "ui/views/controls/menu/menu_delegate.h" 21 #include "ui/views/controls/menu/menu_delegate.h"
24 #include "ui/views/controls/menu/menu_host.h" 22 #include "ui/views/controls/menu/menu_host.h"
25 #include "ui/views/controls/menu/menu_item_view.h" 23 #include "ui/views/controls/menu/menu_item_view.h"
26 #include "ui/views/controls/menu/menu_message_loop.h" 24 #include "ui/views/controls/menu/menu_message_loop.h"
27 #include "ui/views/controls/menu/menu_scroll_view_container.h" 25 #include "ui/views/controls/menu/menu_scroll_view_container.h"
28 #include "ui/views/controls/menu/submenu_view.h" 26 #include "ui/views/controls/menu/submenu_view.h"
29 #include "ui/views/test/menu_test_utils.h" 27 #include "ui/views/test/menu_test_utils.h"
30 #include "ui/views/test/views_test_base.h" 28 #include "ui/views/test/views_test_base.h"
31 29
32 #if defined(USE_AURA) 30 #if defined(USE_AURA)
33 #include "ui/aura/scoped_window_targeter.h" 31 #include "ui/aura/scoped_window_targeter.h" // nogncheck
34 #include "ui/aura/window.h" 32 #include "ui/aura/window.h" // nogncheck
35 #include "ui/views/controls/menu/menu_pre_target_handler.h" 33 #include "ui/views/controls/menu/menu_pre_target_handler.h"
36 #include "ui/wm/public/drag_drop_client.h" 34 #include "ui/wm/public/drag_drop_client.h" // nogncheck
37 #endif 35 #endif
38 36
39 #if defined(USE_X11) 37 #if defined(USE_X11)
40 #include <X11/Xlib.h> 38 #include <X11/Xlib.h>
41 #undef Bool 39 #undef Bool
42 #undef None 40 #undef None
43 #include "ui/events/test/events_test_utils_x11.h" 41 #include "ui/events/test/events_test_utils_x11.h"
44 #endif 42 #endif
45 43
46 namespace views { 44 namespace views {
(...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after
1399 aura::client::SetDragDropClient(owner()->GetNativeWindow()->GetRootWindow(), 1397 aura::client::SetDragDropClient(owner()->GetNativeWindow()->GetRootWindow(),
1400 &drag_drop_client); 1398 &drag_drop_client);
1401 AddButtonMenuItems(); 1399 AddButtonMenuItems();
1402 StartDrag(); 1400 StartDrag();
1403 } 1401 }
1404 1402
1405 #endif // defined(USE_AURA) 1403 #endif // defined(USE_AURA)
1406 1404
1407 } // namespace test 1405 } // namespace test
1408 } // namespace views 1406 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698