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 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 | 797 |
798 base::RunLoop run_loop; | 798 base::RunLoop run_loop; |
799 quit_ = run_loop.QuitClosure(); | 799 quit_ = run_loop.QuitClosure(); |
800 run_loop.Run(); | 800 run_loop.Run(); |
801 } | 801 } |
802 | 802 |
803 private: | 803 private: |
804 bool CheckMaximized() { | 804 bool CheckMaximized() { |
805 if (!window_->IsMaximized()) { | 805 if (!window_->IsMaximized()) { |
806 base::MessageLoop::current()->task_runner()->PostTask( | 806 base::MessageLoop::current()->task_runner()->PostTask( |
807 FROM_HERE, base::Bind( | 807 FROM_HERE, |
| 808 base::BindOnce( |
808 base::IgnoreResult(&MaximizedBrowserWindowWaiter::CheckMaximized), | 809 base::IgnoreResult(&MaximizedBrowserWindowWaiter::CheckMaximized), |
809 base::Unretained(this))); | 810 base::Unretained(this))); |
810 return false; | 811 return false; |
811 } | 812 } |
812 | 813 |
813 // Quit the run_loop to end the wait. | 814 // Quit the run_loop to end the wait. |
814 if (!quit_.is_null()) | 815 if (!quit_.is_null()) |
815 base::ResetAndReturn(&quit_).Run(); | 816 base::ResetAndReturn(&quit_).Run(); |
816 return true; | 817 return true; |
817 } | 818 } |
(...skipping 1644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2462 DetachToBrowserTabDragControllerTest, | 2463 DetachToBrowserTabDragControllerTest, |
2463 ::testing::Values("mouse", "touch")); | 2464 ::testing::Values("mouse", "touch")); |
2464 INSTANTIATE_TEST_CASE_P(TabDragging, | 2465 INSTANTIATE_TEST_CASE_P(TabDragging, |
2465 DetachToBrowserTabDragControllerTestTouch, | 2466 DetachToBrowserTabDragControllerTestTouch, |
2466 ::testing::Values("touch")); | 2467 ::testing::Values("touch")); |
2467 #else | 2468 #else |
2468 INSTANTIATE_TEST_CASE_P(TabDragging, | 2469 INSTANTIATE_TEST_CASE_P(TabDragging, |
2469 DetachToBrowserTabDragControllerTest, | 2470 DetachToBrowserTabDragControllerTest, |
2470 ::testing::Values("mouse")); | 2471 ::testing::Values("mouse")); |
2471 #endif | 2472 #endif |
OLD | NEW |