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 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1826 | 1826 |
1827 // Create another browser on the second display. | 1827 // Create another browser on the second display. |
1828 aura::Window::Windows roots = ash::Shell::GetAllRootWindows(); | 1828 aura::Window::Windows roots = ash::Shell::GetAllRootWindows(); |
1829 ASSERT_EQ(2u, roots.size()); | 1829 ASSERT_EQ(2u, roots.size()); |
1830 aura::Window* first_root = roots[0]; | 1830 aura::Window* first_root = roots[0]; |
1831 aura::Window* second_root = roots[1]; | 1831 aura::Window* second_root = roots[1]; |
1832 gfx::Rect work_area = gfx::Screen::GetScreen() | 1832 gfx::Rect work_area = gfx::Screen::GetScreen() |
1833 ->GetDisplayNearestWindow(second_root) | 1833 ->GetDisplayNearestWindow(second_root) |
1834 .work_area(); | 1834 .work_area(); |
1835 work_area.Inset(20, 20, 20, 60); | 1835 work_area.Inset(20, 20, 20, 60); |
1836 Browser::CreateParams params(browser()->profile(), | 1836 Browser::CreateParams params(browser()->profile()); |
1837 browser()->host_desktop_type()); | |
1838 params.initial_show_state = ui::SHOW_STATE_NORMAL; | 1837 params.initial_show_state = ui::SHOW_STATE_NORMAL; |
1839 params.initial_bounds = work_area; | 1838 params.initial_bounds = work_area; |
1840 Browser* browser2 = new Browser(params); | 1839 Browser* browser2 = new Browser(params); |
1841 AddBlankTabAndShow(browser2); | 1840 AddBlankTabAndShow(browser2); |
1842 | 1841 |
1843 TabStrip* tab_strip2 = GetTabStripForBrowser(browser2); | 1842 TabStrip* tab_strip2 = GetTabStripForBrowser(browser2); |
1844 ResetIDs(browser2->tab_strip_model(), 100); | 1843 ResetIDs(browser2->tab_strip_model(), 100); |
1845 | 1844 |
1846 EXPECT_EQ(second_root, | 1845 EXPECT_EQ(second_root, |
1847 browser2->window()->GetNativeWindow()->GetRootWindow()); | 1846 browser2->window()->GetNativeWindow()->GetRootWindow()); |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2362 DetachToBrowserTabDragControllerTest, | 2361 DetachToBrowserTabDragControllerTest, |
2363 ::testing::Values("mouse", "touch")); | 2362 ::testing::Values("mouse", "touch")); |
2364 INSTANTIATE_TEST_CASE_P(TabDragging, | 2363 INSTANTIATE_TEST_CASE_P(TabDragging, |
2365 DetachToBrowserTabDragControllerTestTouch, | 2364 DetachToBrowserTabDragControllerTestTouch, |
2366 ::testing::Values("touch")); | 2365 ::testing::Values("touch")); |
2367 #elif defined(USE_ASH) | 2366 #elif defined(USE_ASH) |
2368 INSTANTIATE_TEST_CASE_P(TabDragging, | 2367 INSTANTIATE_TEST_CASE_P(TabDragging, |
2369 DetachToBrowserTabDragControllerTest, | 2368 DetachToBrowserTabDragControllerTest, |
2370 ::testing::Values("mouse")); | 2369 ::testing::Values("mouse")); |
2371 #endif | 2370 #endif |
OLD | NEW |