Fixing problem with edge swipe exiting immersive mode

ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

Index: ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
index 5a7c9b17bd7aa784c80dd13038641d4074d95b22..8ec71571f04dfd7c303325f61fec0a1c38c83475 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -1155,6 +1155,69 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtBottom) {
   DestroyMaximizeModeWindowManager();
 }
 
+// Test that an edge swipe from the top on an immersive mode window will not end
+// full screen mode.
+TEST_F(MaximizeModeWindowManagerTest, NoExitImmersiveModeWithEdgeSwipeFromTop) {
+  scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
+                                  gfx::Rect(10, 10, 200, 50)));
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  wm::ActivateWindow(window.get());
+  CreateMaximizeModeWindowManager();
+
+  // Fullscreen the window.
+  wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
+  window_state->OnWMEvent(&event);
+  EXPECT_TRUE(window_state->IsFullscreen());
+  EXPECT_FALSE(window_state->immersive_mode());
+  EXPECT_EQ(window.get(), wm::GetActiveWindow());
+
+  // Do an edge swipe top into screen.
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  generator.GestureScrollSequence(gfx::Point(50, 0),
+                                  gfx::Point(50, 100),
+                                  base::TimeDelta::FromMilliseconds(20),
+                                  10);
+
+  // It should have not exited full screen or immersive mode.
+  EXPECT_TRUE(window_state->IsFullscreen());
+  EXPECT_TRUE(window_state->immersive_mode());
+
+  DestroyMaximizeModeWindowManager();
+}
+
+// Test that an edge swipe from the bottom will not end immersive mode.
+TEST_F(MaximizeModeWindowManagerTest,
+       NoExitImmersiveModeWithEdgeSwipeFromBottom) {
+  scoped_ptr<aura::Window> window(CreateWindow(ui::wm::WINDOW_TYPE_NORMAL,
+                                               gfx::Rect(10, 10, 200, 50)));
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  wm::ActivateWindow(window.get());
+  CreateMaximizeModeWindowManager();
+
+  // Fullscreen the window.
+  wm::WMEvent event(wm::WM_EVENT_TOGGLE_FULLSCREEN);
+  window_state->OnWMEvent(&event);
+  EXPECT_TRUE(window_state->IsFullscreen());
+  EXPECT_FALSE(window_state->immersive_mode());
+  EXPECT_EQ(window.get(), wm::GetActiveWindow());
+  window_state->set_immersive_mode(true);
+  EXPECT_TRUE(window_state->immersive_mode());
+
+  // Do an edge swipe bottom into screen.
+  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
+  int y = Shell::GetPrimaryRootWindow()->bounds().bottom();
+  generator.GestureScrollSequence(gfx::Point(50, y),
+                                  gfx::Point(50, y - 100),
+                                  base::TimeDelta::FromMilliseconds(20),
+                                  10);
+
+  // The window should still be full screen and immersive.
+  EXPECT_TRUE(window_state->IsFullscreen());
+  EXPECT_TRUE(window_state->immersive_mode());
+
+  DestroyMaximizeModeWindowManager();
+}
+
 #endif  // OS_WIN
 
 }  // namespace ash