Revert of Refactor backdrop

components/exo/wm_helper_ash.cc

 // Copyright 2016 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 "components/exo/wm_helper_ash.h"
 
+#include "ash/accessibility_delegate.h"
 #include "ash/public/cpp/config.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/memory/singleton.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace exo {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperAsh, public:
 
 WMHelperAsh::WMHelperAsh() {
   ash::Shell::Get()->AddShellObserver(this);
   ash::Shell::Get()->activation_client()->AddObserver(this);
   // TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
   if (ash::ShellPort::Get()->GetAshConfig() != ash::Config::MUS)
     ash::Shell::Get()->cursor_manager()->AddObserver(this);
   ash::ShellPort::Get()->AddDisplayObserver(this);
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   focus_client->AddObserver(this);
   ui::InputDeviceManager::GetInstance()->AddObserver(this);
+  ash::Shell::Get()->system_tray_notifier()->AddAccessibilityObserver(this);
 }
 
 WMHelperAsh::~WMHelperAsh() {
   if (!ash::Shell::HasInstance())
     return;
   aura::client::FocusClient* focus_client =
       aura::client::GetFocusClient(ash::Shell::GetPrimaryRootWindow());
   focus_client->RemoveObserver(this);
   ash::ShellPort::Get()->RemoveDisplayObserver(this);
   // TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
   if (ash::ShellPort::Get()->GetAshConfig() != ash::Config::MUS)
     ash::Shell::Get()->cursor_manager()->RemoveObserver(this);
   ash::Shell::Get()->activation_client()->RemoveObserver(this);
   ash::Shell::Get()->RemoveShellObserver(this);
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
+  ash::Shell::Get()->system_tray_notifier()->RemoveAccessibilityObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WMHelperAsh, private:
 
 const display::ManagedDisplayInfo WMHelperAsh::GetDisplayInfo(
     int64_t display_id) const {
   return ash::Shell::Get()->display_manager()->GetDisplayInfo(display_id);
 }
 
@@ skipping 40 matching lines @@
 void WMHelperAsh::RemovePostTargetHandler(ui::EventHandler* handler) {
   ash::Shell::Get()->RemovePostTargetHandler(handler);
 }
 
 bool WMHelperAsh::IsMaximizeModeWindowManagerEnabled() const {
   return ash::Shell::Get()
       ->maximize_mode_controller()
       ->IsMaximizeModeWindowManagerEnabled();
 }
 
+bool WMHelperAsh::IsSpokenFeedbackEnabled() const {
+  return ash::Shell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled();
+}
+
+void WMHelperAsh::PlayEarcon(int sound_key) const {
+  return ash::Shell::Get()->accessibility_delegate()->PlayEarcon(sound_key);
+}
+
 void WMHelperAsh::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   NotifyWindowActivated(gained_active, lost_active);
 }
 
 void WMHelperAsh::OnWindowFocused(aura::Window* gained_focus,
                                   aura::Window* lost_focus) {
   NotifyWindowFocused(gained_focus, lost_focus);
 }
 
 void WMHelperAsh::OnCursorVisibilityChanged(bool is_visible) {
   NotifyCursorVisibilityChanged(is_visible);
 }
 
 void WMHelperAsh::OnCursorSetChanged(ui::CursorSetType cursor_set) {
   NotifyCursorSetChanged(cursor_set);
 }
 
+void WMHelperAsh::OnAccessibilityModeChanged(
+    ash::AccessibilityNotificationVisibility notify) {
+  NotifyAccessibilityModeChanged();
+}
+
 void WMHelperAsh::OnMaximizeModeStarted() {
   NotifyMaximizeModeStarted();
 }
 
 void WMHelperAsh::OnMaximizeModeEnding() {
   NotifyMaximizeModeEnding();
 }
 
 void WMHelperAsh::OnMaximizeModeEnded() {
   NotifyMaximizeModeEnded();
 }
 
 void WMHelperAsh::OnDisplayConfigurationChanged() {
   NotifyDisplayConfigurationChanged();
 }
 
 void WMHelperAsh::OnKeyboardDeviceConfigurationChanged() {
   NotifyKeyboardDeviceConfigurationChanged();
 }
 
 }  // namespace exo