Move AccessibilityDelegate ownership to ash::WmShell

ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
-#include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/root_window_controller.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
-#include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
-#include "services/ui/public/interfaces/accessibility_manager.mojom.h"
 
 namespace ash {
 namespace mus {
 
 namespace {
 
 // TODO(jamescook): After ShellDelegate is ported to ash/common use
 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version
 // of SessionStateDelegate.
 class SessionStateDelegateStub : public SessionStateDelegate {
@@ skipping 45 matching lines @@
 
  private:
   bool screen_locked_;
 
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
-class AccessibilityDelegateMus : public DefaultAccessibilityDelegate {
- public:
-  explicit AccessibilityDelegateMus(shell::Connector* connector)
-      : connector_(connector) {}
-  ~AccessibilityDelegateMus() override {}
-
- private:
-  ui::mojom::AccessibilityManager* GetAccessibilityManager() {
-    if (!accessibility_manager_ptr_.is_bound())
-      connector_->ConnectToInterface("mojo:ui", &accessibility_manager_ptr_);
-    return accessibility_manager_ptr_.get();
-  }
-
-  // DefaultAccessibilityDelegate:
-  void ToggleHighContrast() override {
-    DefaultAccessibilityDelegate::ToggleHighContrast();
-    GetAccessibilityManager()->SetHighContrastMode(IsHighContrastEnabled());
-  }
-
-  ui::mojom::AccessibilityManagerPtr accessibility_manager_ptr_;
-  shell::Connector* connector_;
-
-  DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateMus);
-};
-
 }  // namespace
 
 WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
-                       ::ui::WindowTreeClient* client,
-                       shell::Connector* connector)
+                       ::ui::WindowTreeClient* client)
     : WmShell(std::move(shell_delegate)),
       client_(client),
-      connector_(connector),
       session_state_delegate_(new SessionStateDelegateStub) {
   client_->AddObserver(this);
   WmShell::Set(this);
 
   CreateMaximizeModeController();
 
   CreateMruWindowTracker();
 
-  accessibility_delegate_.reset(new AccessibilityDelegateMus(connector_));
   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
 
   // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
   SetKeyboardUI(KeyboardUI::Create());
 }
 
 WmShellMus::~WmShellMus() {
   // This order mirrors that of Shell.
 
   // Destroy maximize mode controller early on since it has some observers which
@@ skipping 144 matching lines @@
 
 void WmShellMus::OnOverviewModeStarting() {
   FOR_EACH_OBSERVER(ShellObserver, *shell_observers(),
                     OnOverviewModeStarting());
 }
 
 void WmShellMus::OnOverviewModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded());
 }
 
-AccessibilityDelegate* WmShellMus::GetAccessibilityDelegate() {
-  return accessibility_delegate_.get();
-}
-
 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() {
   return session_state_delegate_.get();
 }
 
 void WmShellMus::AddActivationObserver(WmActivationObserver* observer) {
   activation_observers_.AddObserver(observer);
 }
 
 void WmShellMus::RemoveActivationObserver(WmActivationObserver* observer) {
   activation_observers_.RemoveObserver(observer);
@@ skipping 48 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash