Implementation of the Touch Exploration Mode - Part II (ash)

ash/root_window_controller.h

Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 6199a5cee1c6efca27efe385d1dde273f62f9fba..11d431bd6a82cb35a1e611f1607062ad1c8127c4 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -17,6 +17,11 @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ui_base_types.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/tray_accessibility.h"
+#include "ash/test/root_window_controller_test_api_chromeos.h"

[sadrul, 2014/05/02 15:47:24]

You should not include from ash/test/

[mfomitchev, 2014/05/02 19:22:53]

Oops! Actually we don't even need this test API anymore, since we are no longer
using the RootWindowController in the unit test, so I will just get rid of
ash::test::RootWindowControllerTestApi.

+#endif
+
 class SkBitmap;
 
 namespace aura {
@@ -34,6 +39,10 @@ class KeyboardController;
 
 namespace ui {
 class EventHandler;
+
+#if defined(OS_CHROMEOS)
+class TouchExplorationController;
+#endif
 }
 
 namespace views {
@@ -77,7 +86,11 @@ 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 :
+#if defined(OS_CHROMEOS)
+                                        public AccessibilityObserver,

[sadrul, 2014/05/02 15:47:24]

Instead of making the RootWindowController an AccessibilityObserver, could we
have a chromeos-only implementation of AccessiblityObserver (e.g.
CrosAccessiblityObserver, which toggles the touch-exploration mode on/off) that
the RootWindowController owns? We would have less #ifdef with that.

[dmazzoni, 2014/05/02 18:28:30]

Yeah, that makes sense. Actually it's not clear why any of this has to live in
RootWindowController - the only thing it uses is GetRootWindow. A little helper
class could do everything.

I'd call the class TouchExplorationController or something like that, and have
it implement AccessiblityObserver.

[mfomitchev, 2014/05/02 19:22:53]

@dmazzoni:
Somebody has to own TouchExplorationController. I chose RootWindowController
because it owns some similar objects, e.g. touch_hud_projection_,
touch_hud_debug_. If you can think of a better owner - let me know.

[mfomitchev, 2014/05/02 19:22:53]

@sadrul

Done.

+#endif
+                                        public ShellObserver {
  public:
 
   // Creates and Initialize the RootWindowController for primary display.
@@ -239,6 +252,10 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   bool IsVirtualKeyboardWindow(aura::Window* window);
 
  private:
+#if defined(OS_CHROMEOS)
+  friend class ash::test::RootWindowControllerTestApi;
+#endif
+
   explicit RootWindowController(AshWindowTreeHost* host);
   enum RootWindowType {
     PRIMARY,
@@ -261,6 +278,10 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   // types in the shell UI.
   void CreateContainersInRootWindow(aura::Window* root_window);
 
+#if defined(OS_CHROMEOS)
+  void UpdateTouchExplorationState();
+#endif
+
   // Enables projection touch HUD.
   void EnableTouchHudProjection();
 
@@ -271,6 +292,12 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
   virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
 
+#if defined(OS_CHROMEOS)
+  // Overridden from AccessibilityObserver.
+  virtual void OnAccessibilityModeChanged(
+      AccessibilityNotificationVisibility notify) OVERRIDE;
+#endif
+
   scoped_ptr<AshWindowTreeHost> ash_host_;
   RootWindowLayoutManager* root_window_layout_;
 
@@ -293,8 +320,10 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   PanelLayoutManager* panel_layout_manager_;
 
   scoped_ptr<SystemBackgroundController> system_background_;
+
 #if defined(OS_CHROMEOS)
   scoped_ptr<BootSplashScreen> boot_splash_screen_;
+  scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_;
 #endif
 
   scoped_ptr<ScreenDimmer> screen_dimmer_;