Correct immersive mode gestures under rotation

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 
 #include "base/timer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "ui/aura/window_observer.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget_observer.h"
 
 class BrowserView;
 class BookmarkBarView;
 class TopContainerView;
 
 namespace aura {
@@ skipping 10 matching lines @@
 
 namespace views {
 class View;
 }
 
 class ImmersiveModeControllerAsh : public ImmersiveModeController,
                                    public content::NotificationObserver,
                                    public ui::EventHandler,
                                    public ui::ImplicitAnimationObserver,
                                    public views::FocusChangeListener,
-                                   public views::WidgetObserver {
+                                   public views::WidgetObserver,
+                                   public aura::WindowObserver {
  public:
   ImmersiveModeControllerAsh();
   virtual ~ImmersiveModeControllerAsh();
 
   // These methods are used to increment and decrement |revealed_lock_count_|.
   // If immersive mode is enabled, a transition from 1 to 0 in
   // |revealed_lock_count_| closes the top-of-window views and a transition
   // from 0 to 1 in |revealed_lock_count_| reveals the top-of-window views.
   void LockRevealedState(AnimateReveal animate_reveal);
   void UnlockRevealedState();
@@ skipping 34 matching lines @@
                                 views::View* focused_now) OVERRIDE;
 
   // views::WidgetObserver overrides:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
   virtual void OnWidgetActivationChanged(views::Widget* widget,
                                          bool active) OVERRIDE;
 
   // ui::ImplicitAnimationObserver override:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE;
 
+  // aura::WindowObserver overrides:
+  virtual void OnWindowPropertyChanged(aura::Window* window,
+                                       const void* key,
+                                       intptr_t old) OVERRIDE;
+  virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE;
+  virtual void OnWindowRemovedFromRootWindow(aura::Window* window) OVERRIDE;
+
   // Testing interface.
   void SetForceHideTabIndicatorsForTest(bool force);
   void StartRevealForTest(bool hovered);
   void SetMouseHoveredForTest(bool hovered);
 
  private:
   friend class ImmersiveModeControllerAshTest;
 
   enum Animate {
     ANIMATE_NO,
@@ skipping 82 matching lines @@
   // Starts an animation for |layer| of |duration_ms| to |target_transform|.
   // If non-NULL, sets |observer| to be notified when the animation completes.
   void DoLayerAnimation(ui::Layer* layer,
                         const gfx::Transform& target_transform,
                         int duration_ms,
                         ui::ImplicitAnimationObserver* observer);
 
   // Returns the type of swipe given |event|.
   SwipeType GetSwipeType(ui::GestureEvent* event) const;
 
   // True when |location| is "near" to the top container. When the top container

[pkotwicz, 2013/05/27 21:32:46]

Nit: update the comment

[rharrison, 2013/05/28 17:03:01]

Done.

   // is not closed "near" means within the displayed bounds. When the top
   // container is closed "near" means either within the displayed bounds or
   // within a few pixels of it. This allow the container to steal enough pixels
   // to detect a swipe in.
-  bool IsNearTopContainer(gfx::Point location) const;
+  bool ShouldHandleEvent(const gfx::Point& location) const;
+
+  // Call Add/RemovePreTargerHandler since either the RootWindow has changed or
+  // the enabled state of observing has changed.
+  void SetPreTargetHandler();

[James Cook, 2013/05/28 16:29:42]

nit: Consider making this UpdatePreTargetHandler(bool add), since "Set" implies
to me that you are always adding, never removing. This also makes it more clear
what's happening during the sequence of setting observers_enabled_ and
installing the handler.

[rharrison, 2013/05/28 17:03:01]

Done.

 
   // Injected dependencies. Not owned.
   Delegate* delegate_;
   views::Widget* widget_;
   TopContainerView* top_container_;
 
   // True if the window observers are enabled.
   bool observers_enabled_;
 
   // True when in immersive mode.
@@ skipping 16 matching lines @@
   int mouse_x_when_hit_top_;
 
   // Lock which keeps the top-of-window views revealed based on the current
   // mouse state.
   scoped_ptr<ImmersiveRevealedLock> mouse_revealed_lock_;
 
   // Lock which keeps the top-of-window views revealed based on the focused view
   // and the active widget.
   scoped_ptr<ImmersiveRevealedLock> focus_revealed_lock_;
 
-  // Native window for the browser, needed to clean up observers.
+  // Native window for the browser.
   aura::Window* native_window_;
 
-  // Observer to disable immersive mode when window leaves the maximized state.
-  class WindowObserver;
-  scoped_ptr<WindowObserver> window_observer_;
-
   // Manages widgets which are anchored to the top-of-window views.
   class AnchoredWidgetManager;
   scoped_ptr<AnchoredWidgetManager> anchored_widget_manager_;
 
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<ImmersiveModeControllerAsh> weak_ptr_factory_;
 
   // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the
   // following events.
   bool gesture_begun_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_