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

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

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: We have both kinds of compile fixes: mac and windows Created 3 years, 10 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 1998 matching lines...) Expand 10 before | Expand all | Expand 10 after
2009 2009
2010 // Create another browser on the second display. 2010 // Create another browser on the second display.
2011 aura::Window::Windows roots = ash::Shell::GetAllRootWindows(); 2011 aura::Window::Windows roots = ash::Shell::GetAllRootWindows();
2012 ASSERT_EQ(2u, roots.size()); 2012 ASSERT_EQ(2u, roots.size());
2013 aura::Window* first_root = roots[0]; 2013 aura::Window* first_root = roots[0];
2014 aura::Window* second_root = roots[1]; 2014 aura::Window* second_root = roots[1];
2015 gfx::Rect work_area = display::Screen::GetScreen() 2015 gfx::Rect work_area = display::Screen::GetScreen()
2016 ->GetDisplayNearestWindow(second_root) 2016 ->GetDisplayNearestWindow(second_root)
2017 .work_area(); 2017 .work_area();
2018 work_area.Inset(20, 20, 20, 60); 2018 work_area.Inset(20, 20, 20, 60);
2019 Browser::CreateParams params(browser()->profile()); 2019 Browser::CreateParams params(browser()->profile(), true);
2020 params.initial_show_state = ui::SHOW_STATE_NORMAL; 2020 params.initial_show_state = ui::SHOW_STATE_NORMAL;
2021 params.initial_bounds = work_area; 2021 params.initial_bounds = work_area;
2022 Browser* browser2 = new Browser(params); 2022 Browser* browser2 = new Browser(params);
2023 AddBlankTabAndShow(browser2); 2023 AddBlankTabAndShow(browser2);
2024 2024
2025 TabStrip* tab_strip2 = GetTabStripForBrowser(browser2); 2025 TabStrip* tab_strip2 = GetTabStripForBrowser(browser2);
2026 ResetIDs(browser2->tab_strip_model(), 100); 2026 ResetIDs(browser2->tab_strip_model(), 100);
2027 2027
2028 EXPECT_EQ(second_root, 2028 EXPECT_EQ(second_root,
2029 browser2->window()->GetNativeWindow()->GetRootWindow()); 2029 browser2->window()->GetNativeWindow()->GetRootWindow());
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
2558 DetachToBrowserTabDragControllerTest, 2558 DetachToBrowserTabDragControllerTest,
2559 ::testing::Values("mouse", "touch")); 2559 ::testing::Values("mouse", "touch"));
2560 INSTANTIATE_TEST_CASE_P(TabDragging, 2560 INSTANTIATE_TEST_CASE_P(TabDragging,
2561 DetachToBrowserTabDragControllerTestTouch, 2561 DetachToBrowserTabDragControllerTestTouch,
2562 ::testing::Values("touch")); 2562 ::testing::Values("touch"));
2563 #else 2563 #else
2564 INSTANTIATE_TEST_CASE_P(TabDragging, 2564 INSTANTIATE_TEST_CASE_P(TabDragging,
2565 DetachToBrowserTabDragControllerTest, 2565 DetachToBrowserTabDragControllerTest,
2566 ::testing::Values("mouse")); 2566 ::testing::Values("mouse"));
2567 #endif 2567 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698