Index: chrome/browser/ui/views/frame/immersive_mode_controller_ash.h |
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h |
index 8b33c12f6420f8193fa0191f6dd8e3fa3d4840f8..462c47174b78d5365f0a0016916b0733ddd8050b 100644 |
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h |
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h |
@@ -7,6 +7,7 @@ |
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
+#include "base/observer_list.h" |
#include "base/timer.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -75,6 +76,8 @@ class ImmersiveModeControllerAsh : public ImmersiveModeController, |
int y_offset) OVERRIDE; |
virtual void UnanchorWidgetFromTopContainer(views::Widget* widget) OVERRIDE; |
virtual void OnTopContainerBoundsChanged() OVERRIDE; |
+ virtual void AddObserver(Observer* observer) OVERRIDE; |
+ virtual void RemoveObserver(Observer* observer) OVERRIDE; |
// content::NotificationObserver override: |
virtual void Observe(int type, |
@@ -249,6 +252,10 @@ class ImmersiveModeControllerAsh : public ImmersiveModeController, |
// the top edge of the screen. |
int mouse_x_when_hit_top_; |
+ // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the |
+ // following events. |
+ bool gesture_begun_; |
+ |
// Lock which keeps the top-of-window views revealed based on the current |
// mouse state and the current touch state. Acquiring the lock is used to |
// trigger a reveal when the user moves the mouse to the top of the screen |
@@ -273,14 +280,12 @@ class ImmersiveModeControllerAsh : public ImmersiveModeController, |
class AnchoredWidgetManager; |
scoped_ptr<AnchoredWidgetManager> anchored_widget_manager_; |
+ ObserverList<Observer> observers_; |
+ |
content::NotificationRegistrar registrar_; |
base::WeakPtrFactory<ImmersiveModeControllerAsh> weak_ptr_factory_; |
James Cook
2013/06/17 16:13:41
Good catch that weak_prt_factory_ should be last.
|
- // Tracks if the controller has seen a ET_GESTURE_SCROLL_BEGIN, without the |
- // following events. |
- bool gesture_begun_; |
- |
DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAsh); |
}; |