Add in gesture for immersive mode

ash/wm/gestures/border_gesture_handler.cc

 // Copyright (c) 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/gestures/border_gesture_handler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
+#include "ash/wm/property_util.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
+#include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
 // How far from the edge of the display a gesture can start and be considered an
 // edge gesture.
@@ skipping 31 matching lines @@
       gfx::Rect screen =
           Shell::GetScreen()->GetDisplayNearestWindow(target).bounds();
       if (!screen.Contains(event.location())) {
         return true;
       }
       break;
   }
   return false;
 }
 
+bool BorderGestureHandler::HandleImmersiveControl(
+    aura::Window* target,
+    const ui::GestureEvent& event) {
+  // If not in immersive mode let the gesture pass through
+  if (!GetRootWindowController(target->GetRootWindow())->IsImmersiveMode())
+    return false;
+
+  switch (event.type()) {
+    case ui::ET_GESTURE_SCROLL_BEGIN:
+      return true;
+    case ui::ET_GESTURE_SCROLL_UPDATE:
+      GetRootWindowController(
+          target->GetRootWindow())->SetPendingImmersiveGesture(true);

[sadrul, 2013/04/19 01:41:20]

I think you should do this in SCROLL_BEGIN

[rharrison, 2013/04/22 18:36:52]

I agree, I suspect this is a typo

+      return true;
+    case ui::ET_GESTURE_SCROLL_END:
+    case ui::ET_SCROLL_FLING_START:
+      return true;
+    default:
+      return false;
+  }
+}
+
 bool BorderGestureHandler::HandleLauncherControl(
     const ui::GestureEvent& event) {
   ShelfLayoutManager* shelf =
       Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   switch (shelf->GetAlignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
       if (start_location_.test(BORDER_LOCATION_BOTTOM))
         return shelf_handler_.ProcessGestureEvent(event);
       break;
     case SHELF_ALIGNMENT_LEFT:
       if (start_location_.test(BORDER_LOCATION_LEFT))
         return shelf_handler_.ProcessGestureEvent(event);
       break;
     case SHELF_ALIGNMENT_TOP:
-      if (start_location_.test(BORDER_LOCATION_TOP))
-        return shelf_handler_.ProcessGestureEvent(event);
+      NOTREACHED();
       break;
     case SHELF_ALIGNMENT_RIGHT:
       if (start_location_.test(BORDER_LOCATION_RIGHT))
         return shelf_handler_.ProcessGestureEvent(event);
       break;
   }
   return false;
 }
 
 bool BorderGestureHandler::HandleBorderGestureStart(
     aura::Window* target,
     const ui::GestureEvent& event) {
   orientation_ = BORDER_SCROLL_ORIENTATION_UNSET;
   start_location_.reset();
 
   gfx::Rect screen =
       Shell::GetScreen()->GetDisplayNearestWindow(target).bounds();
   GestureStartInTargetArea(screen, event);
 
-  if (start_location_.any())
+  if (start_location_.test(BORDER_LOCATION_TOP))
+    return HandleImmersiveControl(target, event);
+  if (start_location_.test(BORDER_LOCATION_BOTTOM) ||
+      start_location_.test(BORDER_LOCATION_LEFT) ||
+      start_location_.test(BORDER_LOCATION_RIGHT))
     return HandleLauncherControl(event);
   return false;
 }
 
 bool BorderGestureHandler::HandleBorderGestureUpdate(
     aura::Window* target,
     const ui::GestureEvent& event) {
+  if (IsGestureInImmersiveOrientation(event))
+    return HandleImmersiveControl(target, event);
   if (IsGestureInLauncherOrientation(event))
     return HandleLauncherControl(event);
   return false;
 }
 
 bool BorderGestureHandler::HandleBorderGestureEnd(
     aura::Window* target,
     const ui::GestureEvent& event) {
-  bool ret_val = HandleLauncherControl(event);
+  bool ret_val = false;
+  if (IsGestureInImmersiveOrientation(event))
+    ret_val = HandleImmersiveControl(target, event);
+  if (IsGestureInLauncherOrientation(event))
+    ret_val = HandleLauncherControl(event);
   start_location_.reset();
   return ret_val;
 }
 
 void BorderGestureHandler::GestureStartInTargetArea(
     const gfx::Rect& screen,
     const ui::GestureEvent& event) {
   if (event.y() > screen.bottom() - kBottomEdgeThreshold)
     start_location_[BORDER_LOCATION_BOTTOM] = 1;
   if (event.x() < screen.x() + kLeftEdgeThreshold)
@@ skipping 10 matching lines @@
     if (!event.details().scroll_x() && !event.details().scroll_y())
       return false;
     orientation_ = abs(event.details().scroll_y()) >
         abs(event.details().scroll_x()) ?
         BORDER_SCROLL_ORIENTATION_VERTICAL :
         BORDER_SCROLL_ORIENTATION_HORIZONTAL;
   }
   return true;
 }
 
+bool BorderGestureHandler::IsGestureInImmersiveOrientation(
+    const ui::GestureEvent& event) {
+  if (ui::ET_GESTURE_SCROLL_UPDATE == event.type()) {
+    BorderScrollOrientation  new_orientation = abs(event.details().scroll_y()) >
+        abs(event.details().scroll_x()) ?
+        BORDER_SCROLL_ORIENTATION_VERTICAL :
+        BORDER_SCROLL_ORIENTATION_HORIZONTAL;
+    if (new_orientation != orientation_)
+      return false;
+  }
+
+  if (start_location_.test(BORDER_LOCATION_TOP) &&
+      orientation_ == BORDER_SCROLL_ORIENTATION_VERTICAL)
+    return true;
+  return false;
+}
+
 bool BorderGestureHandler::IsGestureInLauncherOrientation(
     const ui::GestureEvent& event) {
-  BorderScrollOrientation  new_orientation = abs(event.details().scroll_y()) >
-      abs(event.details().scroll_x()) ?
-      BORDER_SCROLL_ORIENTATION_VERTICAL : BORDER_SCROLL_ORIENTATION_HORIZONTAL;
-  if (new_orientation != orientation_)
-    return false;
+  if (ui::ET_GESTURE_SCROLL_UPDATE == event.type()) {
+    BorderScrollOrientation  new_orientation = abs(event.details().scroll_y()) >
+        abs(event.details().scroll_x()) ?
+        BORDER_SCROLL_ORIENTATION_VERTICAL :
+        BORDER_SCROLL_ORIENTATION_HORIZONTAL;
+    if (new_orientation != orientation_)
+      return false;
+  }
 
   ShelfLayoutManager* shelf =
       Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   switch (shelf->GetAlignment()) {
     case SHELF_ALIGNMENT_BOTTOM:
       if (orientation_ == BORDER_SCROLL_ORIENTATION_VERTICAL)
         return true;
       break;
     case SHELF_ALIGNMENT_LEFT:
       if (orientation_ == BORDER_SCROLL_ORIENTATION_HORIZONTAL)
         return true;
       break;
     case SHELF_ALIGNMENT_TOP:
-      if (orientation_ == BORDER_SCROLL_ORIENTATION_VERTICAL)
-        return true;
+      NOTREACHED();
       break;
     case SHELF_ALIGNMENT_RIGHT:
       if (orientation_ == BORDER_SCROLL_ORIENTATION_HORIZONTAL)
         return true;
       break;
   }
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash