Index: ash/root_window_controller.h |
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h |
index 6199a5cee1c6efca27efe385d1dde273f62f9fba..657cffee7406f9750410608ac1ba8ea58e107303 100644 |
--- a/ash/root_window_controller.h |
+++ b/ash/root_window_controller.h |
@@ -7,10 +7,13 @@ |
#include <map> |
+#include "ash/accessibility_delegate.h" |
Daniel Erat
2014/04/18 00:44:08
do you need this include?
|
#include "ash/ash_export.h" |
#include "ash/shelf/shelf_types.h" |
#include "ash/shell_observer.h" |
+#include "ash/system/tray_accessibility.h" |
#include "ash/system/user/login_status.h" |
+#include "ash/touch/touch_exploration_controller.h" |
Daniel Erat
2014/04/18 00:44:08
forward-declare TouchExplorationController and mov
|
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "ui/aura/window.h" |
@@ -77,7 +80,8 @@ class BootSplashScreen; |
// The RootWindowController for particular root window is stored in |
// its property (RootWindowSettings) and can be obtained using |
// |GetRootWindowController(aura::WindowEventDispatcher*)| function. |
-class ASH_EXPORT RootWindowController : public ShellObserver { |
+class ASH_EXPORT RootWindowController : public ShellObserver, |
+ public AccessibilityObserver { |
public: |
// Creates and Initialize the RootWindowController for primary display. |
@@ -271,6 +275,12 @@ class ASH_EXPORT RootWindowController : public ShellObserver { |
virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE; |
virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; |
+ void UpdateTouchExplorationState(); |
Daniel Erat
2014/04/18 00:44:08
nit: add a comment and move this above the ShellOb
|
+ |
+ // Overridden from AccessibilityObserver. |
+ virtual void OnAccessibilityModeChanged( |
+ AccessibilityNotificationVisibility notify) OVERRIDE; |
+ |
scoped_ptr<AshWindowTreeHost> ash_host_; |
RootWindowLayoutManager* root_window_layout_; |
@@ -313,6 +323,8 @@ class ASH_EXPORT RootWindowController : public ShellObserver { |
scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_; |
scoped_ptr< ::wm::ScopedCaptureClient> capture_client_; |
+ scoped_ptr<TouchExplorationController> touch_exploration_controller_; |
+ |
DISALLOW_COPY_AND_ASSIGN(RootWindowController); |
}; |