| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ash/drag_drop/drag_drop_controller.h" | 5 #include "ash/drag_drop/drag_drop_controller.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #include "ui/aura/window_event_dispatcher.h" | 13 #include "ui/aura/window_event_dispatcher.h" |
| 14 #include "ui/base/dragdrop/drag_drop_types.h" | 14 #include "ui/base/dragdrop/drag_drop_types.h" |
| 15 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
| 16 #include "ui/base/test/ui_controls.h" | 16 #include "ui/base/test/ui_controls.h" |
| 17 #include "ui/base/ui_base_paths.h" | 17 #include "ui/base/ui_base_paths.h" |
| 18 #include "ui/gl/gl_surface.h" | 18 #include "ui/gl/gl_surface.h" |
| 19 #include "ui/views/view.h" | 19 #include "ui/views/view.h" |
| 20 #include "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 namespace internal { | |
| 24 namespace { | 23 namespace { |
| 25 | 24 |
| 26 class DraggableView : public views::View { | 25 class DraggableView : public views::View { |
| 27 public: | 26 public: |
| 28 DraggableView() {} | 27 DraggableView() {} |
| 29 virtual ~DraggableView() {} | 28 virtual ~DraggableView() {} |
| 30 | 29 |
| 31 // views::View overrides: | 30 // views::View overrides: |
| 32 virtual int GetDragOperations(const gfx::Point& press_pt) OVERRIDE { | 31 virtual int GetDragOperations(const gfx::Point& press_pt) OVERRIDE { |
| 33 return ui::DragDropTypes::DRAG_MOVE; | 32 return ui::DragDropTypes::DRAG_MOVE; |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 10, 10, base::Bind(&DragDropAcrossMultiDisplay_Step1)); | 176 10, 10, base::Bind(&DragDropAcrossMultiDisplay_Step1)); |
| 178 | 177 |
| 179 base::MessageLoop::current()->Run(); | 178 base::MessageLoop::current()->Run(); |
| 180 | 179 |
| 181 EXPECT_TRUE(target_view->dropped()); | 180 EXPECT_TRUE(target_view->dropped()); |
| 182 | 181 |
| 183 source->Close(); | 182 source->Close(); |
| 184 target->Close(); | 183 target->Close(); |
| 185 } | 184 } |
| 186 | 185 |
| 187 } // namespace internal | |
| 188 } // namespace ash | 186 } // namespace ash |
| OLD | NEW |