Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 16174003: Make all tests use GetActiveDesktop() instead of hardcoding HOST_DESKTOP_TYPE_NATIVE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/property_util.h" 7 #include "ash/wm/property_util.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 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after
1316 1316
1317 // Create another browser on the second display. 1317 // Create another browser on the second display.
1318 std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows()); 1318 std::vector<aura::RootWindow*> roots(ash::Shell::GetAllRootWindows());
1319 ASSERT_EQ(2u, roots.size()); 1319 ASSERT_EQ(2u, roots.size());
1320 aura::RootWindow* first_root = roots[0]; 1320 aura::RootWindow* first_root = roots[0];
1321 aura::RootWindow* second_root = roots[1]; 1321 aura::RootWindow* second_root = roots[1];
1322 gfx::Rect work_area = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow( 1322 gfx::Rect work_area = gfx::Screen::GetNativeScreen()->GetDisplayNearestWindow(
1323 second_root).work_area(); 1323 second_root).work_area();
1324 work_area.Inset(20,20,20,60); 1324 work_area.Inset(20,20,20,60);
1325 Browser::CreateParams params(browser()->profile(), 1325 Browser::CreateParams params(browser()->profile(),
1326 chrome::HOST_DESKTOP_TYPE_NATIVE); 1326 browser()->host_desktop_type());
1327 params.initial_show_state = ui::SHOW_STATE_NORMAL; 1327 params.initial_show_state = ui::SHOW_STATE_NORMAL;
1328 params.initial_bounds = work_area; 1328 params.initial_bounds = work_area;
1329 Browser* browser2 = new Browser(params); 1329 Browser* browser2 = new Browser(params);
1330 AddBlankTabAndShow(browser2); 1330 AddBlankTabAndShow(browser2);
1331 1331
1332 TabStrip* tab_strip2 = GetTabStripForBrowser(browser2); 1332 TabStrip* tab_strip2 = GetTabStripForBrowser(browser2);
1333 ResetIDs(browser2->tab_strip_model(), 100); 1333 ResetIDs(browser2->tab_strip_model(), 100);
1334 1334
1335 EXPECT_EQ(second_root, 1335 EXPECT_EQ(second_root,
1336 browser2->window()->GetNativeWindow()->GetRootWindow()); 1336 browser2->window()->GetNativeWindow()->GetRootWindow());
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1713 DifferentDeviceScaleFactorDisplayTabDragControllerTest, 1713 DifferentDeviceScaleFactorDisplayTabDragControllerTest,
1714 ::testing::Values("mouse")); 1714 ::testing::Values("mouse"));
1715 INSTANTIATE_TEST_CASE_P(TabDragging, 1715 INSTANTIATE_TEST_CASE_P(TabDragging,
1716 DetachToBrowserTabDragControllerTest, 1716 DetachToBrowserTabDragControllerTest,
1717 ::testing::Values("mouse", "touch")); 1717 ::testing::Values("mouse", "touch"));
1718 #else 1718 #else
1719 INSTANTIATE_TEST_CASE_P(TabDragging, 1719 INSTANTIATE_TEST_CASE_P(TabDragging,
1720 DetachToBrowserTabDragControllerTest, 1720 DetachToBrowserTabDragControllerTest,
1721 ::testing::Values("mouse")); 1721 ::testing::Values("mouse"));
1722 #endif 1722 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698