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

chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index ab5491a81d5ecdbeb60ccc180d32bddef5c5aa9d..740051c8c21219c349871462ead35bfd4ef359ed 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -41,6 +40,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(USE_ATHENA)
+#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
 #endif
 
@@ -66,6 +66,7 @@ void InitAfterSessionStart() {
 #endif
 }
 
+#if !defined(USE_ATHENA)

[pkotwicz, 2014/10/28 01:21:30]

This entire file should not compile on Athena. However, there is quite a bit of
work in order to get it to not compile.

I promise, I will get rid of all of the Athena ifdefs in Ash code once Athena no
longer compiles Ash

 class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
  public:
   AccessibilityDelegateImpl() {}
@@ -83,7 +84,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
   }
 
   virtual void ToggleSpokenFeedback(
-      ash::AccessibilityNotificationVisibility notify) override {
+      ui::AccessibilityNotificationVisibility notify) override {
     DCHECK(chromeos::AccessibilityManager::Get());
     chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify);
   }
@@ -98,7 +99,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
     return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
   }
 
-  virtual void SetMagnifierType(ash::MagnifierType type) override {
+  virtual void SetMagnifierType(ui::MagnifierType type) override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
   }
@@ -108,7 +109,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
     return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
   }
 
-  virtual ash::MagnifierType GetMagnifierType() const override {
+  virtual ui::MagnifierType GetMagnifierType() const override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->GetMagnifierType();
   }
@@ -173,18 +174,18 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
   }
 
   virtual void TriggerAccessibilityAlert(
-      ash::AccessibilityAlert alert) override {
+      ui::AccessibilityAlert alert) override {
     Profile* profile = ProfileManager::GetActiveUserProfile();
     if (profile) {
       switch (alert) {
-        case ash::A11Y_ALERT_WINDOW_NEEDED: {
+        case ui::A11Y_ALERT_WINDOW_NEEDED: {
           AccessibilityAlertInfo event(
               profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED));
           SendControlAccessibilityNotification(
               ui::AX_EVENT_ALERT, &event);
           break;
         }
-        case ash::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: {
+        case ui::A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED: {
           AccessibilityAlertInfo event(
               profile, l10n_util::GetStringUTF8(
                   IDS_A11Y_ALERT_WINDOW_OVERVIEW_MODE_ENTERED));
@@ -192,14 +193,14 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
               ui::AX_EVENT_ALERT, &event);
           break;
         }
-        case ash::A11Y_ALERT_NONE:
+        case ui::A11Y_ALERT_NONE:
           break;
       }
     }
   }
 
-  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 {
@@ -214,6 +215,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
  private:
   DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateImpl);
 };
+#endif
 
 }  // anonymous namespace
 
@@ -239,7 +241,11 @@ ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
 }
 
 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {
+#if defined(USE_ATHENA)
+  return nullptr;
+#else
   return new AccessibilityDelegateImpl;
+#endif
 }
 
 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() {