Side Slide Gestures for Accessibility

ash/root_window_controller.cc

 // Copyright (c) 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 "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
+#include "ash/audio/sounds.h"

[dmazzoni, 2014/07/15 18:04:02]

No longer needed?

[lisayin, 2014/07/15 18:47:43]

Done.

 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/root_window_settings.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 47 matching lines @@
 #include "ui/views/view_model_utils.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/drag_drop_client.h"
 #include "ui/wm/public/tooltip_client.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/system/tray_accessibility.h"
+#include "ash/ash_touch_exploration_manager_chromeos.h"
 #include "ash/wm/boot_splash_screen_chromeos.h"
 #include "ui/chromeos/touch_exploration_controller.h"
 #endif
 
 namespace ash {
 namespace {
 
 #if defined(OS_CHROMEOS)
 // Duration for the animation that hides the boot splash screen, in
 // milliseconds.  This should be short enough in relation to
@@ skipping 164 matching lines @@
   }
   virtual bool HasHitTestMask() const OVERRIDE {
     return false;
   }
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyWindowDelegate);
 };
 
-#if defined(OS_CHROMEOS)
-// Responsible for initializing TouchExplorationController when spoken
-// feedback is on.
-class CrosAccessibilityObserver : public AccessibilityObserver {

[James Cook, 2014/07/15 18:21:57]

Hooray for making root_window_controller.cc shorter!

- public:
-  explicit CrosAccessibilityObserver(
-      RootWindowController* root_window_controller)
-      : root_window_controller_(root_window_controller) {
-    Shell::GetInstance()->system_tray_notifier()->
-        AddAccessibilityObserver(this);
-    UpdateTouchExplorationState();
-  }
-
-  virtual ~CrosAccessibilityObserver() {
-    SystemTrayNotifier* system_tray_notifier =
-        Shell::GetInstance()->system_tray_notifier();
-    if (system_tray_notifier)
-      system_tray_notifier->RemoveAccessibilityObserver(this);
-  }
-
- private:
-  void UpdateTouchExplorationState() {
-    AccessibilityDelegate* delegate =
-        Shell::GetInstance()->accessibility_delegate();
-    bool enabled = delegate->IsSpokenFeedbackEnabled();
-
-    if (enabled && !touch_exploration_controller_.get()) {
-      touch_exploration_controller_.reset(
-          new ui::TouchExplorationController(
-              root_window_controller_->GetRootWindow()));
-    } else if (!enabled) {
-      touch_exploration_controller_.reset();
-    }
-  }
-
-  // Overridden from AccessibilityObserver.
-  virtual void OnAccessibilityModeChanged(
-      AccessibilityNotificationVisibility notify) OVERRIDE {
-    UpdateTouchExplorationState();
-  }
-
-  scoped_ptr<ui::TouchExplorationController> touch_exploration_controller_;
-  RootWindowController* root_window_controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(CrosAccessibilityObserver);
-};
-#endif  // OS_CHROMEOS
-
 }  // namespace
 
 void RootWindowController::CreateForPrimaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host);
   controller->Init(RootWindowController::PRIMARY,
                    Shell::GetInstance()->delegate()->IsFirstRunAfterBoot());
 }
 
 void RootWindowController::CreateForSecondaryDisplay(AshWindowTreeHost* host) {
   RootWindowController* controller = new RootWindowController(host);
@@ skipping 479 matching lines @@
     if (shell->session_state_delegate()->NumberOfLoggedInUsers())
       shelf()->CreateShelf();
 
     // Notify shell observers about new root window.
     shell->OnRootWindowAdded(root_window);
   }
 
 #if defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshDisableTouchExplorationMode)) {
     cros_accessibility_observer_.reset(new CrosAccessibilityObserver(this));

[dmazzoni, 2014/07/15 18:04:01]

Rename this to match the new name of the class.

[lisayin, 2014/07/15 21:46:44]

Done.

   }
 #endif
 }
 
 void RootWindowController::InitLayoutManagers() {
   aura::Window* root_window = GetRootWindow();
   root_window_layout_ = new RootWindowLayoutManager(root_window);
   root_window->SetLayoutManager(root_window_layout_);
 
   aura::Window* default_container =
@@ skipping 289 matching lines @@
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace ash