| OLD | NEW |
| 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/button/menu_button.h" | 5 #include "ui/views/controls/button/menu_button.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.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/base/dragdrop/drag_drop_types.h" | 12 #include "ui/base/dragdrop/drag_drop_types.h" |
| 13 #include "ui/events/test/event_generator.h" | 13 #include "ui/events/test/event_generator.h" |
| 14 #include "ui/views/animation/test/ink_drop_host_view_test_api.h" | 14 #include "ui/views/animation/test/ink_drop_host_view_test_api.h" |
| 15 #include "ui/views/animation/test/test_ink_drop.h" | 15 #include "ui/views/animation/test/test_ink_drop.h" |
| 16 #include "ui/views/controls/button/menu_button_listener.h" | 16 #include "ui/views/controls/button/menu_button_listener.h" |
| 17 #include "ui/views/drag_controller.h" | 17 #include "ui/views/drag_controller.h" |
| 18 #include "ui/views/test/views_test_base.h" | 18 #include "ui/views/test/views_test_base.h" |
| 19 | 19 |
| 20 #if defined(USE_AURA) | 20 #if defined(USE_AURA) |
| 21 #include "ui/aura/client/drag_drop_client.h" |
| 21 #include "ui/events/event.h" | 22 #include "ui/events/event.h" |
| 22 #include "ui/events/event_handler.h" | 23 #include "ui/events/event_handler.h" |
| 23 #include "ui/wm/public/drag_drop_client.h" | |
| 24 #endif | 24 #endif |
| 25 | 25 |
| 26 using base::ASCIIToUTF16; | 26 using base::ASCIIToUTF16; |
| 27 | 27 |
| 28 namespace views { | 28 namespace views { |
| 29 | 29 |
| 30 using test::InkDropHostViewTestApi; | 30 using test::InkDropHostViewTestApi; |
| 31 using test::TestInkDrop; | 31 using test::TestInkDrop; |
| 32 | 32 |
| 33 // A MenuButton subclass that provides access to some MenuButton internals. | 33 // A MenuButton subclass that provides access to some MenuButton internals. |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 | 616 |
| 617 generator()->MoveTouch(gfx::Point(10, 30)); | 617 generator()->MoveTouch(gfx::Point(10, 30)); |
| 618 generator()->ReleaseTouch(); | 618 generator()->ReleaseTouch(); |
| 619 EXPECT_EQ(Button::STATE_NORMAL, button()->state()); | 619 EXPECT_EQ(Button::STATE_NORMAL, button()->state()); |
| 620 EXPECT_EQ(nullptr, menu_button_listener.last_source()); | 620 EXPECT_EQ(nullptr, menu_button_listener.last_source()); |
| 621 } | 621 } |
| 622 | 622 |
| 623 #endif // !defined(OS_MACOSX) || defined(USE_AURA) | 623 #endif // !defined(OS_MACOSX) || defined(USE_AURA) |
| 624 | 624 |
| 625 } // namespace views | 625 } // namespace views |
| OLD | NEW |