| 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 <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 | 154 |
| 155 } // namespace test | 155 } // namespace test |
| 156 | 156 |
| 157 using test::GetCenterInScreenCoordinates; | 157 using test::GetCenterInScreenCoordinates; |
| 158 using test::SetID; | 158 using test::SetID; |
| 159 using test::ResetIDs; | 159 using test::ResetIDs; |
| 160 using test::IDString; | 160 using test::IDString; |
| 161 using test::GetTabStripForBrowser; | 161 using test::GetTabStripForBrowser; |
| 162 | 162 |
| 163 TabDragControllerTest::TabDragControllerTest() | 163 TabDragControllerTest::TabDragControllerTest() |
| 164 : native_browser_list(BrowserList::GetInstance( | 164 : native_browser_list( |
| 165 chrome::HOST_DESKTOP_TYPE_NATIVE)) { | 165 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE)) {} |
| 166 } | |
| 167 | 166 |
| 168 TabDragControllerTest::~TabDragControllerTest() { | 167 TabDragControllerTest::~TabDragControllerTest() { |
| 169 } | 168 } |
| 170 | 169 |
| 171 void TabDragControllerTest::StopAnimating(TabStrip* tab_strip) { | 170 void TabDragControllerTest::StopAnimating(TabStrip* tab_strip) { |
| 172 tab_strip->StopAnimating(true); | 171 tab_strip->StopAnimating(true); |
| 173 } | 172 } |
| 174 | 173 |
| 175 void TabDragControllerTest::AddTabAndResetBrowser(Browser* browser) { | 174 void TabDragControllerTest::AddTabAndResetBrowser(Browser* browser) { |
| 176 AddBlankTabAndShow(browser); | 175 AddBlankTabAndShow(browser); |
| (...skipping 2176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2353 DetachToBrowserTabDragControllerTest, | 2352 DetachToBrowserTabDragControllerTest, |
| 2354 ::testing::Values("mouse", "touch")); | 2353 ::testing::Values("mouse", "touch")); |
| 2355 INSTANTIATE_TEST_CASE_P(TabDragging, | 2354 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2356 DetachToBrowserTabDragControllerTestTouch, | 2355 DetachToBrowserTabDragControllerTestTouch, |
| 2357 ::testing::Values("touch")); | 2356 ::testing::Values("touch")); |
| 2358 #elif defined(USE_ASH) | 2357 #elif defined(USE_ASH) |
| 2359 INSTANTIATE_TEST_CASE_P(TabDragging, | 2358 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2360 DetachToBrowserTabDragControllerTest, | 2359 DetachToBrowserTabDragControllerTest, |
| 2361 ::testing::Values("mouse")); | 2360 ::testing::Values("mouse")); |
| 2362 #endif | 2361 #endif |
| OLD | NEW |