Correct immersive mode gestures under rotation

chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc

 // Copyright 2012 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 "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
+#include <string>
+#include <vector>
+
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
+#include "base/string_number_conversions.h"
+#include "base/string_util.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 using views::View;
 
@@ skipping 307 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 ImmersiveModeControllerAsh::ImmersiveModeControllerAsh()
     : browser_view_(NULL),
       observers_enabled_(false),
       enabled_(false),
       reveal_state_(CLOSED),
       revealed_lock_count_(0),
       tab_indicator_visibility_(TAB_INDICATORS_HIDE),
       native_window_(NULL),
+      root_window_(NULL),
       weak_ptr_factory_(this),
-      gesture_begun_(false) {
+      gesture_begun_(false),
+      bezel_inset_(0) {
 }
 
 ImmersiveModeControllerAsh::~ImmersiveModeControllerAsh() {
   // The browser view is being destroyed so there's no need to update its
   // layout or layers, even if the top views are revealed. But the window
   // observers still need to be removed.
   EnableWindowObservers(false);
 }
 
 void ImmersiveModeControllerAsh::LockRevealedState(
@@ skipping 16 matching lines @@
 void ImmersiveModeControllerAsh::MaybeRevealWithoutAnimation() {
   MaybeStartReveal(ANIMATE_NO);
 }
 
 void ImmersiveModeControllerAsh::Init(BrowserView* browser_view) {
   browser_view_ = browser_view;
   // Browser view is detached from its widget during destruction. Cache the
   // window pointer so |this| can stop observing during destruction.
   native_window_ = browser_view_->GetNativeWindow();
   DCHECK(native_window_);
+  root_window_ = native_window_->GetRootWindow();
+  DCHECK(root_window_);
 
   // Optionally allow the tab indicators to be hidden.
   if (CommandLine::ForCurrentProcess()->
           HasSwitch(ash::switches::kAshImmersiveHideTabIndicators)) {
     tab_indicator_visibility_ = TAB_INDICATORS_FORCE_HIDE;
   }
 
   anchored_widget_manager_.reset(new AnchoredWidgetManager(this));
+
+  // Add inset to account for maximum bezel sensor.
+#if defined(USE_XI2_MT)
+  std::vector<std::string> parts;
+  if (Tokenize(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kTouchCalibration), ",", &parts) >= 4) {
+    for (int i = 0; i < 4; i++) {
+      int new_inset;
+      if (base::StringToInt(parts[i], &new_inset)) {
+        bezel_inset_ = std::max(new_inset, bezel_inset_);
+      }
+    }
+  }
+#endif
 }
 
 void ImmersiveModeControllerAsh::SetEnabled(bool enabled) {
   DCHECK(browser_view_) << "Must initialize before enabling";
   if (enabled_ == enabled)
     return;
   enabled_ = enabled;
 
   // Delay the initialization of the window observers till the first call to
   // SetEnabled(true) because FullscreenController is not yet initialized when
@@ skipping 259 matching lines @@
   views::FocusManager* focus_manager = widget->GetFocusManager();
   if (enable) {
     widget->AddObserver(this);
     focus_manager->AddFocusChangeListener(this);
   } else {
     widget->RemoveObserver(this);
     focus_manager->RemoveFocusChangeListener(this);
   }
 
   if (enable)
-    native_window_->AddPreTargetHandler(this);
+    root_window_->AddPreTargetHandler(this);
   else
-    native_window_->RemovePreTargetHandler(this);
+    root_window_->RemovePreTargetHandler(this);

[sadrul, 2013/05/22 18:22:45]

Is it possible for root_window_ to become invalid (e.g. when the display the
window is currently on is removed)?

[rharrison, 2013/05/22 20:58:49]

Done.

 
   // The window observer adds and removes itself from the native window.
   window_observer_.reset(enable ? new WindowObserver(this) : NULL);
 
   if (enable) {
     registrar_.Add(
         this,
         chrome::NOTIFICATION_FULLSCREEN_CHANGED,
         content::Source<FullscreenController>(
             browser_view_->browser()->fullscreen_controller()));
@@ skipping 301 matching lines @@
     return SWIPE_CLOSE;
   else if (event->details().scroll_y() > 0)
     return SWIPE_OPEN;
   return SWIPE_NONE;
 }
 
 bool ImmersiveModeControllerAsh::IsNearTopContainer(gfx::Point location) const {
   gfx::Rect near_bounds =
       browser_view_->top_container()->GetTargetBoundsInScreen();
   if (reveal_state_ == CLOSED)
-    near_bounds.Inset(gfx::Insets(0, 0, -kNearTopContainerDistance, 0));
+    near_bounds.Inset(gfx::Insets(-bezel_inset_,
+                                  0,
+                                  -kNearTopContainerDistance,
+                                  0));
   return near_bounds.Contains(location);

[sadrul, 2013/05/22 18:22:45]

Could you just do:

   return near_bounds.Contains(location) ||
          location.y() < near_bounds.y();

[rharrison, 2013/05/22 20:58:49]

Done.

 }