Enable immersive fullscreen on Windows Ash.

ash/wm/immersive_fullscreen_controller.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 <set>
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
@@ skipping 44 matching lines @@
 // vertical. This is used to make sure that gesture is close to vertical instead
 // of just more vertical then horizontal.
 const int kSwipeVerticalThresholdMultiplier = 3;
 
 // The height in pixels of the region above the top edge of the display which
 // hosts the immersive fullscreen window in which mouse events are ignored
 // (cannot reveal or unreveal the top-of-window views).
 // See ShouldIgnoreMouseEventAtLocation() for more details.
 const int kHeightOfDeadRegionAboveTopContainer = 10;
 
-// The height in pixels of the region below the top edge of the display in which
-// the mouse can trigger revealing the top-of-window views. The height must be
-// greater than 1px because the top pixel is used to trigger moving the cursor
-// between displays if the user has a vertical display layout (primary display
-// above/below secondary display).
-const int kMouseRevealBoundsHeight = 3;
-
 // Returns the BubbleDelegateView corresponding to |maybe_bubble| if
 // |maybe_bubble| is a bubble.
 views::BubbleDelegateView* AsBubbleDelegate(aura::Window* maybe_bubble) {
   if (!maybe_bubble)
     return NULL;
   views::Widget* widget = views::Widget::GetWidgetForNativeView(maybe_bubble);
   if (!widget)
     return NULL;
   return widget->widget_delegate()->AsBubbleDelegate();
 }
@@ skipping 22 matching lines @@
   return location_in_screen;
 }
 
 // Returns the bounds of the display nearest to |window| in screen coordinates.
 gfx::Rect GetDisplayBoundsInScreen(aura::Window* window) {
   return Shell::GetScreen()->GetDisplayNearestWindow(window).bounds();
 }
 
 }  // namespace
 
+// The height in pixels of the region below the top edge of the display in which
+// the mouse can trigger revealing the top-of-window views. The height must be
+// greater than 1px because the top pixel is used to trigger moving the cursor
+// between displays if the user has a vertical display layout (primary display
+// above/below secondary display).
+#if defined(OS_WIN)
+// Windows 8 reserves some pixels at the top of the screen for the hand icon
+// that allows you to drag a metro app off the screen, so a few additional
+// pixels of space must be reserved for the mouse reveal.
+const int ImmersiveFullscreenController::kMouseRevealBoundsHeight = 9;
+#else
+const int ImmersiveFullscreenController::kMouseRevealBoundsHeight = 3;
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // Class which keeps the top-of-window views revealed as long as one of the
 // bubbles it is observing is visible. The logic to keep the top-of-window
 // views revealed based on the visibility of bubbles anchored to
 // children of |ImmersiveFullscreenController::top_container_| is separate from
 // the logic related to |ImmersiveFullscreenController::focus_revealed_lock_|
 // so that bubbles which are not activatable and bubbles which do not close
 // upon deactivation also keep the top-of-window views revealed for the
 // duration of their visibility.
@@ skipping 266 matching lines @@
 void ImmersiveFullscreenController::OnGestureEvent(ui::GestureEvent* event) {
   if (!enabled_)
     return;
 
   // Touch gestures should not initiate revealing the top-of-window views while
   // |widget_| is inactive.
   if (!widget_->IsActive())
     return;
 
   switch (event->type()) {
+#if defined(OS_WIN)
+    case ui::ET_GESTURE_WIN8_EDGE_SWIPE:
+      UpdateRevealedLocksForSwipe(GetSwipeType(event));
+      event->SetHandled();
+      break;
+#endif
     case ui::ET_GESTURE_SCROLL_BEGIN:
       if (ShouldHandleGestureEvent(GetEventLocationInScreen(*event))) {
         gesture_begun_ = true;
         // Do not consume the event. Otherwise, we end up consuming all
         // ui::ET_GESTURE_SCROLL_BEGIN events in the top-of-window views
         // when the top-of-window views are revealed.
       }
       break;
     case ui::ET_GESTURE_SCROLL_UPDATE:
       if (gesture_begun_) {
@@ skipping 372 matching lines @@
 
   // Callers with ANIMATE_NO expect this function to synchronously reveal the
   // top-of-window views.
   if (reveal_state_ == REVEALED ||
       (reveal_state_ == SLIDING_OPEN && animate != ANIMATE_NO)) {
     return;
   }
 
   RevealState previous_reveal_state = reveal_state_;
   reveal_state_ = SLIDING_OPEN;
+

[pkotwicz, 2014/03/13 18:34:32]

Nuke this change

[zturner, 2014/03/13 19:28:10]

Done.

   if (previous_reveal_state == CLOSED) {
     delegate_->OnImmersiveRevealStarted();
 
     // Do not do any more processing if OnImmersiveRevealStarted() changed
     // |reveal_state_|.
     if (reveal_state_ != SLIDING_OPEN)
       return;
   }
   // Slide in the reveal view.
   if (animate == ANIMATE_NO) {
@@ skipping 41 matching lines @@
 }
 
 void ImmersiveFullscreenController::OnSlideClosedAnimationCompleted() {
   DCHECK_EQ(SLIDING_CLOSED, reveal_state_);
   reveal_state_ = CLOSED;
   delegate_->OnImmersiveRevealEnded();
 }
 
 ImmersiveFullscreenController::SwipeType
 ImmersiveFullscreenController::GetSwipeType(ui::GestureEvent* event) const {
+#if defined(OS_WIN)
+  if (event->type() == ui::ET_GESTURE_WIN8_EDGE_SWIPE)
+    return SWIPE_OPEN;
+#endif
   if (event->type() != ui::ET_GESTURE_SCROLL_UPDATE)
     return SWIPE_NONE;
   // Make sure that it is a clear vertical gesture.
   if (abs(event->details().scroll_y()) <=
       kSwipeVerticalThresholdMultiplier * abs(event->details().scroll_x()))
     return SWIPE_NONE;
   if (event->details().scroll_y() < 0)
     return SWIPE_CLOSE;
   else if (event->details().scroll_y() > 0)
     return SWIPE_OPEN;
@@ skipping 63 matching lines @@
         AsBubbleDelegate(transient_child);
     if (bubble_delegate &&
         bubble_delegate->GetAnchorView() &&
         top_container_->Contains(bubble_delegate->GetAnchorView())) {
       bubble_manager_->StartObserving(transient_child);
     }
   }
 }
 
 }  // namespace ash