| 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 "ash/wm/window_state.h" | 7 #include "ash/wm/window_state.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 using test::GetTabStripForBrowser; | 154 using test::GetTabStripForBrowser; |
| 155 | 155 |
| 156 TabDragControllerTest::TabDragControllerTest() | 156 TabDragControllerTest::TabDragControllerTest() |
| 157 : native_browser_list(BrowserList::GetInstance( | 157 : native_browser_list(BrowserList::GetInstance( |
| 158 chrome::HOST_DESKTOP_TYPE_NATIVE)) { | 158 chrome::HOST_DESKTOP_TYPE_NATIVE)) { |
| 159 } | 159 } |
| 160 | 160 |
| 161 TabDragControllerTest::~TabDragControllerTest() { | 161 TabDragControllerTest::~TabDragControllerTest() { |
| 162 } | 162 } |
| 163 | 163 |
| 164 void TabDragControllerTest::SetUp() { | |
| 165 // TODO(danakj): Remove this when the tests are not flaky (crbug.com/270065) | |
| 166 // or we use test contexts in the renderer to keep things fast enough to | |
| 167 // avoid the flake (crbug.com/270918). | |
| 168 UseRealGLBindings(); | |
| 169 | |
| 170 InProcessBrowserTest::SetUp(); | |
| 171 } | |
| 172 | |
| 173 void TabDragControllerTest::StopAnimating(TabStrip* tab_strip) { | 164 void TabDragControllerTest::StopAnimating(TabStrip* tab_strip) { |
| 174 tab_strip->StopAnimating(true); | 165 tab_strip->StopAnimating(true); |
| 175 } | 166 } |
| 176 | 167 |
| 177 void TabDragControllerTest::AddTabAndResetBrowser(Browser* browser) { | 168 void TabDragControllerTest::AddTabAndResetBrowser(Browser* browser) { |
| 178 AddBlankTabAndShow(browser); | 169 AddBlankTabAndShow(browser); |
| 179 StopAnimating(GetTabStripForBrowser(browser)); | 170 StopAnimating(GetTabStripForBrowser(browser)); |
| 180 ResetIDs(browser->tab_strip_model(), 0); | 171 ResetIDs(browser->tab_strip_model(), 0); |
| 181 } | 172 } |
| 182 | 173 |
| (...skipping 2145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2328 DetachToDockedTabDragControllerTest, | 2319 DetachToDockedTabDragControllerTest, |
| 2329 ::testing::Values("mouse", "mouse docked")); | 2320 ::testing::Values("mouse", "mouse docked")); |
| 2330 INSTANTIATE_TEST_CASE_P(TabDragging, | 2321 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2331 DetachToBrowserTabDragControllerTestTouch, | 2322 DetachToBrowserTabDragControllerTestTouch, |
| 2332 ::testing::Values("touch", "touch docked")); | 2323 ::testing::Values("touch", "touch docked")); |
| 2333 #else | 2324 #else |
| 2334 INSTANTIATE_TEST_CASE_P(TabDragging, | 2325 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 2335 DetachToBrowserTabDragControllerTest, | 2326 DetachToBrowserTabDragControllerTest, |
| 2336 ::testing::Values("mouse")); | 2327 ::testing::Values("mouse")); |
| 2337 #endif | 2328 #endif |
| OLD | NEW |