Move AccessibilityDelegate ownership to ash::WmShell

ash/mus/bridge/wm_shell_mus.h

 // 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.
 
 #ifndef ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 15 matching lines @@
 namespace ash {
 namespace mus {
 
 class WmRootWindowControllerMus;
 class WmWindowMus;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
  public:
   WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
-             ::ui::WindowTreeClient* client,
-             shell::Connector* connector);
+             ::ui::WindowTreeClient* client);
   ~WmShellMus() override;
 
   static WmShellMus* Get();
 
   void AddRootWindowController(WmRootWindowControllerMus* controller);
   void RemoveRootWindowController(WmRootWindowControllerMus* controller);
 
   // Returns the ancestor of |window| (including |window|) that is considered
   // toplevel. |window| may be null.
   static WmWindowMus* GetToplevelAncestor(::ui::Window* window);
@@ skipping 19 matching lines @@
   void RecordUserMetricsAction(UserMetricsAction action) override;
   std::unique_ptr<WindowResizer> CreateDragWindowResizer(
       std::unique_ptr<WindowResizer> next_window_resizer,
       wm::WindowState* window_state) override;
   std::unique_ptr<wm::MaximizeModeEventHandler> CreateMaximizeModeEventHandler()
       override;
   std::unique_ptr<ScopedDisableInternalMouseAndKeyboard>
   CreateScopedDisableInternalMouseAndKeyboard() override;
   void OnOverviewModeStarting() override;
   void OnOverviewModeEnded() override;
-  AccessibilityDelegate* GetAccessibilityDelegate() override;
   SessionStateDelegate* GetSessionStateDelegate() override;
   void AddActivationObserver(WmActivationObserver* observer) override;
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
   void AddPointerWatcher(views::PointerWatcher* watcher) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
 #if defined(OS_CHROMEOS)
   void ToggleIgnoreExternalKeyboard() override;
 #endif
 
  private:
   // Returns true if |window| is a window that can have active children.
   static bool IsActivationParent(::ui::Window* window);
 
   void RemoveClientObserver();
 
   // ::ui::WindowTreeClientObserver:
   void OnWindowTreeFocusChanged(::ui::Window* gained_focus,
                                 ::ui::Window* lost_focus) override;
   void OnDidDestroyClient(::ui::WindowTreeClient* client) override;
 
   ::ui::WindowTreeClient* client_;
-  shell::Connector* connector_;
 
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
-  std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
-
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_