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

Unified Diff: athena/wm/window_manager_unittest.cc

Issue 550043002: Keep the split view activities topmost in z-order in Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
Index: athena/wm/window_manager_unittest.cc
diff --git a/athena/wm/window_manager_unittest.cc b/athena/wm/window_manager_unittest.cc
index 8c22eb26d9fe5c0c08e9409c8321968d54cc019a..9641c4854ca98d7c4fcce0fc8426487af6fafb79 100644
--- a/athena/wm/window_manager_unittest.cc
+++ b/athena/wm/window_manager_unittest.cc
@@ -260,8 +260,7 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
wm_api.GetWindowListProvider()->GetWindowList();
ASSERT_EQ(4u, windows.size());
EXPECT_EQ(second.get(), windows[3]);
- EXPECT_EQ(third.get(), windows[2]);
- EXPECT_EQ(fourth.get(), windows[1]);
+ EXPECT_EQ(fourth.get(), windows[2]);
// Swipe the title of the right window now. It should switch to |third|.
generator.GestureScrollSequence(gfx::Point(x_middle + 20, 10),
@@ -270,6 +269,10 @@ TEST_F(WindowManagerTest, TitleDragSwitchBetweenWindowsInSplitViewMode) {
5);
EXPECT_EQ(second.get(), wm_api.GetSplitViewController()->left_window());
EXPECT_EQ(third.get(), wm_api.GetSplitViewController()->right_window());
+ windows = wm_api.GetWindowListProvider()->GetWindowList();
+ ASSERT_EQ(4u, windows.size());
+ EXPECT_EQ(second.get(), windows[3]);
+ EXPECT_EQ(third.get(), windows[2]);
}
TEST_F(WindowManagerTest, NewWindowBounds) {
« athena/wm/split_view_controller_unittest.cc ('K') | « athena/wm/split_view_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698