Move AccessibilityDelegate ownership to ash::WmShell

ash/aura/wm_shell_aura.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 "ash/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 31 matching lines @@
 
 WmShellAura::WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate)
     : WmShell(std::move(shell_delegate)) {
   WmShell::Set(this);
 }
 
 WmShellAura::~WmShellAura() {
   WmShell::Set(nullptr);
 }
 
-void WmShellAura::PrepareForShutdown() {
+void WmShellAura::Shutdown() {
   if (added_activation_observer_)
     Shell::GetInstance()->activation_client()->RemoveObserver(this);
 
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
+
+  WmShell::Shutdown();
 }
 
 WmWindow* WmShellAura::NewContainerWindow() {
   aura::Window* aura_window = new aura::Window(nullptr);
   aura_window->Init(ui::LAYER_NOT_DRAWN);
   return WmWindowAura::Get(aura_window);
 }
 
 WmWindow* WmShellAura::GetFocusedWindow() {
   return WmWindowAura::Get(
@@ skipping 88 matching lines @@
 
 void WmShellAura::OnOverviewModeStarting() {
   FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
                     OnOverviewModeStarting());
 }
 
 void WmShellAura::OnOverviewModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
 }
 
-AccessibilityDelegate* WmShellAura::GetAccessibilityDelegate() {
-  return Shell::GetInstance()->accessibility_delegate();
-}
-
 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
   return Shell::GetInstance()->session_state_delegate();
 }
 
 void WmShellAura::AddActivationObserver(WmActivationObserver* observer) {
   if (!added_activation_observer_) {
     added_activation_observer_ = true;
     Shell::GetInstance()->activation_client()->AddObserver(this);
   }
   activation_observers_.AddObserver(observer);
@@ skipping 52 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanging());
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 }  // namespace ash