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/top_container_view.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/gestures/gesture_configuration.h"
+#include "ui/base/ui_base_switches.h"

[sadrul, 2013/05/23 18:22:07]

I think you don't need most of the new #includes

[rharrison, 2013/05/23 19:10:11]

Done.

 #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 ui::GestureConfiguration;
 using views::View;
@@ skipping 262 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // Observer to watch for window restore. views::Widget does not provide a hook
 // to observe for window restore, so do this at the Aura level.
 class ImmersiveModeControllerAsh::WindowObserver : public aura::WindowObserver {
  public:
   explicit WindowObserver(ImmersiveModeControllerAsh* controller)
       : controller_(controller) {
-    controller_->native_window_->AddObserver(this);
+    window_ = controller_->native_window_;
+    window_->AddObserver(this);
   }
 
   virtual ~WindowObserver() {
-    controller_->native_window_->RemoveObserver(this);
+    window_->RemoveObserver(this);
   }
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) OVERRIDE {
     using aura::client::kShowStateKey;
     if (key == kShowStateKey) {
       // Disable immersive mode when leaving the fullscreen state.
       ui::WindowShowState show_state = static_cast<ui::WindowShowState>(
           window->GetProperty(kShowStateKey));
       if (controller_->IsEnabled() &&
           show_state != ui::SHOW_STATE_FULLSCREEN &&
           show_state != ui::SHOW_STATE_MINIMIZED) {
         controller_->delegate_->FullscreenStateChanged();
       }
       return;
     }
   }
 
+  virtual void OnWindowAddedToRootWindow(aura::Window* window) {
+    if (window == window_)

[sadrul, 2013/05/23 18:22:07]

DCHECK_EQ(window_, window) instead.

[rharrison, 2013/05/23 19:10:11]

Done.

+      controller_->SetPreTargetHandler();

[sadrul, 2013/05/23 18:22:07]

Do you need to override OnWindowRemovedFromRootWindow() too?

[rharrison, 2013/05/23 19:10:11]

Done.

+  }
+
  private:
   ImmersiveModeControllerAsh* controller_;  // Not owned.
+  aura::Window* window_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(WindowObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 ImmersiveModeControllerAsh::ImmersiveModeControllerAsh()
     : delegate_(NULL),
       widget_(NULL),
       top_container_(NULL),
@@ skipping 29 matching lines @@
   if (revealed_lock_count_ == 0) {
     // Always animate ending the reveal fast.
     MaybeEndReveal(ANIMATE_FAST);
   }
 }
 
 void ImmersiveModeControllerAsh::MaybeRevealWithoutAnimation() {
   MaybeStartReveal(ANIMATE_NO);
 }
 
+void ImmersiveModeControllerAsh::SetPreTargetHandler() {
+  if (!native_window_)
+    return;
+  aura::RootWindow* root_window = native_window_->GetRootWindow();
+  if (!root_window)
+    return;
+  if (observers_enabled_)
+    root_window->AddPreTargetHandler(this);
+  else
+    root_window->RemovePreTargetHandler(this);
+}
+
 void ImmersiveModeControllerAsh::Init(
     Delegate* delegate,
     views::Widget* widget,
     TopContainerView* top_container) {
   delegate_ = delegate;
   widget_ = widget;
   // Browser view is detached from its widget during destruction. Cache the
   // window pointer so |this| can stop observing during destruction.
   native_window_ = widget_->GetNativeWindow();
   top_container_ = top_container;
@@ skipping 264 matching lines @@
       views::Widget::GetWidgetForNativeWindow(native_window_);
   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);
-  else
-    native_window_->RemovePreTargetHandler(this);
+  SetPreTargetHandler();
 
   // 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>(
             delegate_->GetFullscreenController()));
@@ skipping 345 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 = top_container_->GetTargetBoundsInScreen();
   if (reveal_state_ == CLOSED)
     near_bounds.Inset(gfx::Insets(0, 0, -kNearTopContainerDistance, 0));
-  return near_bounds.Contains(location);
+  return near_bounds.Contains(location) ||
+      ((location.y() < near_bounds.y()) &&
+       (location.x() >= near_bounds.x()) &&
+       (location.x() <= near_bounds.x() + near_bounds.width()));
 }