Enable immersive fullscreen on Windows Ash.

ash/wm/immersive_fullscreen_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/immersive_fullscreen_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_event_handler.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-// For now, immersive fullscreen is Chrome OS only.
-#if defined(OS_CHROMEOS)
-
 namespace ash {
 
 namespace {
 
 class MockImmersiveFullscreenControllerDelegate
     : public ImmersiveFullscreenController::Delegate {
  public:
   MockImmersiveFullscreenControllerDelegate(views::View* top_container_view)
       : top_container_view_(top_container_view),
         enabled_(false),
@@ skipping 298 matching lines @@
   lock1.reset();
   EXPECT_TRUE(controller()->IsRevealed());
 
   lock2.reset();
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test mouse event processing for top-of-screen reveal triggering.
 TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {
   // Set up initial state.
-  UpdateDisplay("800x600,800x600");
-  ash::DisplayLayout display_layout(ash::DisplayLayout::RIGHT, 0);
-  ash::Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
-      display_layout);
-
-  // Set up initial state.
   SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
   ASSERT_FALSE(controller()->IsRevealed());
 
   aura::test::EventGenerator& event_generator(GetEventGenerator());
 
   gfx::Rect top_container_bounds_in_screen =
       top_container()->GetBoundsInScreen();
   // A position along the top edge of TopContainerView in screen coordinates.
   gfx::Point top_edge_pos(top_container_bounds_in_screen.x() + 100,
                           top_container_bounds_in_screen.y());
 
   // Mouse wheel event does nothing.
   ui::MouseEvent wheel(
       ui::ET_MOUSEWHEEL, top_edge_pos, top_edge_pos, ui::EF_NONE, ui::EF_NONE);
   event_generator.Dispatch(&wheel);
   EXPECT_FALSE(top_edge_hover_timer_running());
 
   // Move to top edge of screen starts hover timer running. We cannot use
   // MoveMouse() because MoveMouse() stops the timer if it started running.
   event_generator.MoveMouseTo(top_edge_pos);
   EXPECT_TRUE(top_edge_hover_timer_running());
   EXPECT_EQ(top_edge_pos.x(), mouse_x_when_hit_top());
 
   // Moving |ImmersiveFullscreenControllerTest::kMouseRevealBoundsHeight| down
   // from the top edge stops it.
-  event_generator.MoveMouseBy(0, 3);
+  event_generator.MoveMouseBy(0,
+      ImmersiveFullscreenController::kMouseRevealBoundsHeight);
   EXPECT_FALSE(top_edge_hover_timer_running());
 
   // Moving back to the top starts the timer again.
   event_generator.MoveMouseTo(top_edge_pos);
   EXPECT_TRUE(top_edge_hover_timer_running());
   EXPECT_EQ(top_edge_pos.x(), mouse_x_when_hit_top());
 
   // Slight move to the right keeps the timer running for the same hit point.
   event_generator.MoveMouseBy(1, 0);
   EXPECT_TRUE(top_edge_hover_timer_running());
@@ skipping 280 matching lines @@
   EXPECT_FALSE(controller()->IsRevealed());
 
   // Initiate reveal via mouse, end reveal via touch.
   AttemptReveal(MODALITY_MOUSE);
   EXPECT_TRUE(controller()->IsRevealed());
   AttemptUnreveal(MODALITY_GESTURE_TAP);
   EXPECT_FALSE(controller()->IsRevealed());
 }
 
 // Test when the SWIPE_CLOSE edge gesture closes the top-of-window views.
-TEST_F(ImmersiveFullscreenControllerTest, EndRevealViaGesture) {
+#if defined(OS_WIN)
+// On Windows, touch events do not result in mouse events being disabled.  As
+// a result, the last part of this test which ends the reveal via a gesture will
+// not work correctly.  See crbug.com/332430, and the function
+// ShouldHideCursorOnTouch() in compound_event_filter.cc.
+#define MAYBE_EndRevealViaGesture DISABLED_EndRevealViaGesture
+#else
+#define MAYBE_EndRevealViaGesture EndRevealViaGesture
+#endif
+TEST_F(ImmersiveFullscreenControllerTest, MAYBE_EndRevealViaGesture) {
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
 
   // A gesture should be able to close the top-of-window views when
   // top-of-window views have focus.
   AttemptReveal(MODALITY_MOUSE);
   top_container()->RequestFocus();
   EXPECT_TRUE(controller()->IsRevealed());
   AttemptUnreveal(MODALITY_GESTURE_SCROLL);
@@ skipping 354 matching lines @@
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey,
                         ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 }
 
 }  // namespase ash
-
-#endif  // defined(OS_CHROMEOS)