Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0

chrome/browser/ui/ash/chrome_shell_delegate_views.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_views.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index 57a5099ad9955e1def2b653e7730c75f1b6ab2fb..a477270e0c91d4264dea649cd3f2376ab12b4092 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
-#include "ash/magnifier/magnifier_constants.h"
 #include "ash/media_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
@@ -33,6 +32,7 @@
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
+#include "ui/chromeos/accessibility_types.h"
 
 namespace {
 
@@ -83,7 +83,7 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
   }
 
   virtual void ToggleSpokenFeedback(
-      ash::AccessibilityNotificationVisibility notify) override {
+      ui::AccessibilityNotificationVisibility notify) override {
   }
 
   virtual void SetLargeCursorEnabled(bool enalbed) override {
@@ -96,7 +96,7 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
   virtual void SetMagnifierEnabled(bool enabled) override {
   }
 
-  virtual void SetMagnifierType(ash::MagnifierType type) override {
+  virtual void SetMagnifierType(ui::MagnifierType type) override {
   }
 
   virtual bool IsMagnifierEnabled() const override {
@@ -110,8 +110,8 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
     return false;
   }
 
-  virtual ash::MagnifierType GetMagnifierType() const override {
-    return ash::kDefaultMagnifierType;
+  virtual ui::MagnifierType GetMagnifierType() const override {
+    return ui::kDefaultMagnifierType;
   }
 
   virtual void SaveScreenMagnifierScale(double scale) override {
@@ -138,11 +138,11 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
   }
 
   virtual void TriggerAccessibilityAlert(
-      ash::AccessibilityAlert alert) override {
+      ui::AccessibilityAlert alert) override {
   }
 
-  virtual ash::AccessibilityAlert GetLastAccessibilityAlert() override {
-    return ash::A11Y_ALERT_NONE;
+  virtual ui::AccessibilityAlert GetLastAccessibilityAlert() override {
+    return ui::A11Y_ALERT_NONE;
   }
 
   virtual void PlayEarcon(int sound_key) override {