chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc - Issue 292443002: linux_aura: Compile ash into chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase to ToT Created 6 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc ('k') | chrome/browser/ui/views/theme_image_mapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

index 76f23293943ead2b04cfaf8a5cfe561bbf040280..71d49f436cbde5b34340bd5b817d0e7108d7972e 100644

--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc

@@ -1503,7 +1503,7 @@ void DragSingleTabToSeparateWindowInSecondDisplayStep2(

#define MAYBE_DragSingleTabToSeparateWindowInSecondDisplay \

DISABLED_DragSingleTabToSeparateWindowInSecondDisplay

#else

-#define MAYBE_DragSingleTabToSeparateWindow \

+#define MAYBE_DragSingleTabToSeparateWindowInSecondDisplay \

DragSingleTabToSeparateWindowInSecondDisplay

#endif

// Drags from browser to a second display and releases input.

@@ -2047,7 +2047,7 @@ void CancelDragTabToWindowInSeparateDisplayStep2(

} // namespace

-#if defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS) || defined(OS_LINUX)

// TODO(sky,sad): Disabled as it fails due to resize locks with a real

// compositor. crbug.com/331924

#define MAYBE_CancelDragTabToWindowIn2ndDisplay \

@@ -2094,7 +2094,7 @@ IN_PROC_BROWSER_TEST_F(

ui_controls::LEFT, ui_controls::UP));

}

-#if defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS) || defined(OS_LINUX)

// TODO(sky,sad): Disabled as it fails due to resize locks with a real

// compositor. crbug.com/331924

#define MAYBE_CancelDragTabToWindowIn1stDisplay \

@@ -2318,7 +2318,7 @@ IN_PROC_BROWSER_TEST_P(DetachToDockedTabDragControllerTest,

#endif

-#if defined(USE_ASH) && !defined(OS_WIN) // TODO(win_ash)

+#if defined(USE_ASH) && defined(OS_CHROMEOS) // TODO(win_ash,linux_ash)

INSTANTIATE_TEST_CASE_P(TabDragging,

DetachToBrowserInSeparateDisplayTabDragControllerTest,

::testing::Values("mouse", "touch"));

@@ -2334,7 +2334,7 @@ INSTANTIATE_TEST_CASE_P(TabDragging,

INSTANTIATE_TEST_CASE_P(TabDragging,

DetachToBrowserTabDragControllerTestTouch,

::testing::Values("touch", "touch docked"));

-#else

+#elif defined(USE_ASH) && !defined(OS_LINUX) // TODO(linux_ash)

INSTANTIATE_TEST_CASE_P(TabDragging,

DetachToBrowserTabDragControllerTest,

::testing::Values("mouse"));