| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index aafe0ba0c61f8dbeea3e3b61770b5191935adab0..9b53915e61cc0b82232b88d267de6dce8b0fb49c 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -281,16 +281,18 @@ class CrosAccessibilityObserver : public AccessibilityObserver {
|
| system_tray_notifier->RemoveAccessibilityObserver(this);
|
| }
|
|
|
| + ui::TouchExplorationController* GetTouchExplorationController() {
|
| + return touch_exploration_controller_.get();
|
| + }
|
| +
|
| 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()));
|
| + touch_exploration_controller_.reset(new ui::TouchExplorationController(
|
| + root_window_controller_->GetRootWindow()));
|
| } else if (!enabled) {
|
| touch_exploration_controller_.reset();
|
| }
|
| @@ -379,6 +381,13 @@ const aura::Window* RootWindowController::GetRootWindow() const {
|
| return GetHost()->window();
|
| }
|
|
|
| +ui::TouchExplorationController*
|
| +RootWindowController::GetTouchExplorationController() {
|
| + return static_cast<CrosAccessibilityObserver*>(
|
| + cros_accessibility_observer_.get())
|
| + ->GetTouchExplorationController();
|
| +}
|
| +
|
| void RootWindowController::SetWallpaperController(
|
| DesktopBackgroundWidgetController* controller) {
|
| wallpaper_controller_.reset(controller);
|
|
|