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

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

Issue 198413003: Enable immersive fullscreen on Windows Ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix issues from previous review comment. Created 6 years, 9 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/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 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 ASSERT_FALSE(tab_strip->IsDragSessionActive()); 1776 ASSERT_FALSE(tab_strip->IsDragSessionActive());
1777 ASSERT_FALSE(TabDragController::IsActive()); 1777 ASSERT_FALSE(TabDragController::IsActive());
1778 EXPECT_EQ("0 100", IDString(browser2->tab_strip_model())); 1778 EXPECT_EQ("0 100", IDString(browser2->tab_strip_model()));
1779 EXPECT_EQ("1", IDString(browser()->tab_strip_model())); 1779 EXPECT_EQ("1", IDString(browser()->tab_strip_model()));
1780 1780
1781 // Source browser should still be maximized, target should not 1781 // Source browser should still be maximized, target should not
1782 EXPECT_TRUE(browser()->window()->IsMaximized()); 1782 EXPECT_TRUE(browser()->window()->IsMaximized());
1783 EXPECT_FALSE(browser2->window()->IsMaximized()); 1783 EXPECT_FALSE(browser2->window()->IsMaximized());
1784 } 1784 }
1785 1785
1786 // Immersive fullscreen is ChromeOS only. 1786 // Immersive fullscreen is Ash only. However, Windows Ash does not support
1787 // multiple displays.
1787 #if defined(OS_CHROMEOS) 1788 #if defined(OS_CHROMEOS)
1788 // TODO(sky,sad): Disabled as it fails due to resize locks with a real 1789 // TODO(sky,sad): Disabled as it fails due to resize locks with a real
1789 // compositor. crbug.com/331924 1790 // compositor. crbug.com/331924
1790 #define MAYBE_DragTabToImmersiveBrowserOnSeparateDisplay \ 1791 #define MAYBE_DragTabToImmersiveBrowserOnSeparateDisplay \
1791 DISABLED_DragTabToImmersiveBrowserOnSeparateDisplay 1792 DISABLED_DragTabToImmersiveBrowserOnSeparateDisplay
1792 // Drags from a restored browser to an immersive fullscreen browser on a 1793 // Drags from a restored browser to an immersive fullscreen browser on a
1793 // second display and releases input. 1794 // second display and releases input.
1794 IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest, 1795 IN_PROC_BROWSER_TEST_P(DetachToBrowserInSeparateDisplayTabDragControllerTest,
1795 MAYBE_DragTabToImmersiveBrowserOnSeparateDisplay) { 1796 MAYBE_DragTabToImmersiveBrowserOnSeparateDisplay) {
1796 // Add another tab. 1797 // Add another tab.
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
2331 DetachToDockedTabDragControllerTest, 2332 DetachToDockedTabDragControllerTest,
2332 ::testing::Values("mouse", "mouse docked")); 2333 ::testing::Values("mouse", "mouse docked"));
2333 INSTANTIATE_TEST_CASE_P(TabDragging, 2334 INSTANTIATE_TEST_CASE_P(TabDragging,
2334 DetachToBrowserTabDragControllerTestTouch, 2335 DetachToBrowserTabDragControllerTestTouch,
2335 ::testing::Values("touch", "touch docked")); 2336 ::testing::Values("touch", "touch docked"));
2336 #else 2337 #else
2337 INSTANTIATE_TEST_CASE_P(TabDragging, 2338 INSTANTIATE_TEST_CASE_P(TabDragging,
2338 DetachToBrowserTabDragControllerTest, 2339 DetachToBrowserTabDragControllerTest,
2339 ::testing::Values("mouse")); 2340 ::testing::Values("mouse"));
2340 #endif 2341 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/zoom_bubble_view_browsertest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698