| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 2218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2229 | 2229 |
| 2230 bool DragTabAndExecuteTaskWhenDone(const gfx::Point& position, | 2230 bool DragTabAndExecuteTaskWhenDone(const gfx::Point& position, |
| 2231 const base::Closure& task) { | 2231 const base::Closure& task) { |
| 2232 return ui_controls::SendMouseMoveNotifyWhenDone( | 2232 return ui_controls::SendMouseMoveNotifyWhenDone( |
| 2233 position.x(), position.y(), task); | 2233 position.x(), position.y(), task); |
| 2234 } | 2234 } |
| 2235 | 2235 |
| 2236 void QuitWhenNotDragging() { | 2236 void QuitWhenNotDragging() { |
| 2237 DCHECK(TabDragController::IsActive()); | 2237 DCHECK(TabDragController::IsActive()); |
| 2238 test::QuitWhenNotDraggingImpl(); | 2238 test::QuitWhenNotDraggingImpl(); |
| 2239 base::MessageLoop::current()->Run(); | 2239 base::RunLoop().Run(); |
| 2240 } | 2240 } |
| 2241 | 2241 |
| 2242 private: | 2242 private: |
| 2243 DISALLOW_COPY_AND_ASSIGN( | 2243 DISALLOW_COPY_AND_ASSIGN( |
| 2244 DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest); | 2244 DetachToBrowserInSeparateDisplayAndCancelTabDragControllerTest); |
| 2245 }; | 2245 }; |
| 2246 | 2246 |
| 2247 // Invoked from the nested message loop. | 2247 // Invoked from the nested message loop. |
| 2248 void CancelDragTabToWindowInSeparateDisplayStep3( | 2248 void CancelDragTabToWindowInSeparateDisplayStep3( |
| 2249 TabStrip* tab_strip, | 2249 TabStrip* tab_strip, |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2505 DetachToBrowserTabDragControllerTest, | 2505 DetachToBrowserTabDragControllerTest, |
| 2506 ::testing::Values("mouse", "touch")); | 2506 ::testing::Values("mouse", "touch")); |
| 2507 INSTANTIATE_TEST_CASE_P(TabDragging, | 2507 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2508 DetachToBrowserTabDragControllerTestTouch, | 2508 DetachToBrowserTabDragControllerTestTouch, |
| 2509 ::testing::Values("touch")); | 2509 ::testing::Values("touch")); |
| 2510 #else | 2510 #else |
| 2511 INSTANTIATE_TEST_CASE_P(TabDragging, | 2511 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2512 DetachToBrowserTabDragControllerTest, | 2512 DetachToBrowserTabDragControllerTest, |
| 2513 ::testing::Values("mouse")); | 2513 ::testing::Values("mouse")); |
| 2514 #endif | 2514 #endif |
| OLD | NEW |