ash: Remove media dependency from ash.

chrome/browser/ui/ash/chrome_shell_delegate.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include <stddef.h>
 
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
@@ skipping 58 matching lines @@
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/aura/window.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using chromeos::AccessibilityManager;
+
 namespace {
 
 const char kKeyboardShortcutHelpPageUrl[] =
     "https://support.google.com/chromebook/answer/183101";
 
 void InitAfterFirstSessionStart() {
   // Restore focus after the user session is started.  It's needed because some
   // windows can be opened in background while login UI is still active because
   // we currently restore browser windows before login UI is deleted.
   aura::Window::Windows mru_list = ash::WmWindowAura::ToAuraWindows(
       ash::WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
   if (!mru_list.empty())
     mru_list.front()->Focus();
 
   // Enable magnifier scroll keys as there may be no mouse cursor in kiosk mode.
   ash::MagnifierKeyScroller::SetEnabled(chrome::IsRunningInForcedAppMode());
 
   // Enable long press action to toggle spoken feedback with hotrod
   // remote which can't handle shortcut.
   ash::SpokenFeedbackToggler::SetEnabled(chrome::IsRunningInForcedAppMode());
 }
 
 class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
  public:
   AccessibilityDelegateImpl() {
-    ash::WmShell::Get()->AddShellObserver(
-        chromeos::AccessibilityManager::Get());
+    ash::WmShell::Get()->AddShellObserver(AccessibilityManager::Get());
   }
   ~AccessibilityDelegateImpl() override {
-    ash::WmShell::Get()->RemoveShellObserver(
-        chromeos::AccessibilityManager::Get());
+    ash::WmShell::Get()->RemoveShellObserver(AccessibilityManager::Get());
   }
 
   void ToggleHighContrast() override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->EnableHighContrast(
-        !chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->EnableHighContrast(
+        !AccessibilityManager::Get()->IsHighContrastEnabled());
   }
 
   bool IsSpokenFeedbackEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
   }
 
   void ToggleSpokenFeedback(
       ash::AccessibilityNotificationVisibility notify) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->ToggleSpokenFeedback(notify);
   }
 
   bool IsHighContrastEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsHighContrastEnabled();
   }
 
   void SetMagnifierEnabled(bool enabled) override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
   }
 
   void SetMagnifierType(ash::MagnifierType type) override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
   }
 
   bool IsMagnifierEnabled() const override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
   }
 
   ash::MagnifierType GetMagnifierType() const override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->GetMagnifierType();
   }
 
   void SetLargeCursorEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->EnableLargeCursor(enabled);
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->EnableLargeCursor(enabled);
   }
 
   bool IsLargeCursorEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsLargeCursorEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsLargeCursorEnabled();
   }
 
   void SetAutoclickEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->EnableAutoclick(enabled);
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->EnableAutoclick(enabled);
   }
 
   bool IsAutoclickEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsAutoclickEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsAutoclickEnabled();
   }
 
   void SetVirtualKeyboardEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->EnableVirtualKeyboard(
-        enabled);
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->EnableVirtualKeyboard(enabled);
   }
 
   bool IsVirtualKeyboardEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsVirtualKeyboardEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsVirtualKeyboardEnabled();
   }
 
   void SetMonoAudioEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->EnableMonoAudio(enabled);
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->EnableMonoAudio(enabled);
   }
 
   bool IsMonoAudioEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsMonoAudioEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsMonoAudioEnabled();
   }
 
   void SetCaretHighlightEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->SetCaretHighlightEnabled(enabled);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->SetCaretHighlightEnabled(enabled);
   }
 
   bool IsCaretHighlightEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsCaretHighlightEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsCaretHighlightEnabled();
   }
 
   void SetCursorHighlightEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->SetCursorHighlightEnabled(enabled);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->SetCursorHighlightEnabled(enabled);
   }
 
   bool IsCursorHighlightEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsCursorHighlightEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsCursorHighlightEnabled();
   }
 
   void SetFocusHighlightEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->SetFocusHighlightEnabled(enabled);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->SetFocusHighlightEnabled(enabled);
   }
 
   bool IsFocusHighlightEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsFocusHighlightEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsFocusHighlightEnabled();
   }
 
   void SetSelectToSpeakEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->SetSelectToSpeakEnabled(enabled);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->SetSelectToSpeakEnabled(enabled);
   }
 
   bool IsSelectToSpeakEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsSelectToSpeakEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsSelectToSpeakEnabled();
   }
 
   void SetSwitchAccessEnabled(bool enabled) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    chromeos::AccessibilityManager::Get()->SetSwitchAccessEnabled(enabled);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->SetSwitchAccessEnabled(enabled);
   }
 
   bool IsSwitchAccessEnabled() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsSwitchAccessEnabled();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsSwitchAccessEnabled();
   }
 
   bool ShouldShowAccessibilityMenu() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->ShouldShowAccessibilityMenu();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->ShouldShowAccessibilityMenu();
   }
 
   bool IsBrailleDisplayConnected() const override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->IsBrailleDisplayConnected();
+    DCHECK(AccessibilityManager::Get());
+    return AccessibilityManager::Get()->IsBrailleDisplayConnected();
   }
 
   void SilenceSpokenFeedback() const override {
     TtsController::GetInstance()->Stop();
   }
 
   void SaveScreenMagnifierScale(double scale) override {
     if (chromeos::MagnificationManager::Get())
       chromeos::MagnificationManager::Get()->SaveScreenMagnifierScale(scale);
   }
@@ skipping 25 matching lines @@
           break;
       }
     }
   }
 
   ash::AccessibilityAlert GetLastAccessibilityAlert() override {
     return ash::A11Y_ALERT_NONE;
   }
 
   void PlayEarcon(int sound_key) override {
-    DCHECK(chromeos::AccessibilityManager::Get());
-    return chromeos::AccessibilityManager::Get()->PlayEarcon(sound_key);
+    DCHECK(AccessibilityManager::Get());
+    AccessibilityManager::Get()->PlayEarcon(
+        sound_key, chromeos::PlaySoundOption::SPOKEN_FEEDBACK_ENABLED);
   }
 
   base::TimeDelta PlayShutdownSound() const override {
-    return chromeos::AccessibilityManager::Get()->PlayShutdownSound();
+    return AccessibilityManager::Get()->PlayShutdownSound();
   }
 
   void HandleAccessibilityGesture(ui::AXGesture gesture) override {
-    chromeos::AccessibilityManager::Get()->HandleAccessibilityGesture(gesture);
+    AccessibilityManager::Get()->HandleAccessibilityGesture(gesture);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl);
 };
 
 }  // namespace
 
 ChromeShellDelegate::ChromeShellDelegate()
     : shelf_delegate_(NULL) {
@@ skipping 27 matching lines @@
     // allowed, but for an "ephermal" user (see crbug.com/312324) it is not
     // decided yet if he could add other users to his session or not.
     // TODO(skuhne): As soon as the issue above needs to be resolved, this logic
     // should change.
     logged_in_users = 1;
   }
   return admitted_users_to_be_added + logged_in_users > 1;
 }
 
 bool ChromeShellDelegate::IsIncognitoAllowed() const {
-  return chromeos::AccessibilityManager::Get()->IsIncognitoAllowed();
+  return AccessibilityManager::Get()->IsIncognitoAllowed();
 }
 
 bool ChromeShellDelegate::IsRunningInForcedAppMode() const {
   return chrome::IsRunningInForcedAppMode();
 }
 
 bool ChromeShellDelegate::CanShowWindowForUser(ash::WmWindow* window) const {
   return ::CanShowWindowForUser(ash::WmWindowAura::GetAuraWindow(window),
                                 base::Bind(&GetActiveBrowserContext));
 }
@@ skipping 192 matching lines @@
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }