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

chrome/browser/chromeos/accessibility/accessibility_manager.h

Index: chrome/browser/chromeos/accessibility/accessibility_manager.h
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.h b/chrome/browser/chromeos/accessibility/accessibility_manager.h
index 23872cf7498ea0fb9b195c7d108479ef84e30c44..6c8ec49418262689e66ac32eb3507d5502ecfdb0 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.h
@@ -7,8 +7,6 @@
 
 #include <set>
 
-#include "ash/accessibility_delegate.h"
-#include "ash/session/session_state_observer.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/memory/weak_ptr.h"
@@ -22,6 +20,11 @@
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
+#include "ui/chromeos/accessibility_types.h"
+
+#if !defined(USE_ATHENA)
+#include "ash/session/session_state_observer.h"
+#endif
 
 namespace content {
 class RenderViewHost;
@@ -44,18 +47,18 @@ struct AccessibilityStatusEventDetails {
   AccessibilityStatusEventDetails(
       AccessibilityNotificationType notification_type,
       bool enabled,
-      ash::AccessibilityNotificationVisibility notify);
+      ui::AccessibilityNotificationVisibility notify);
 
   AccessibilityStatusEventDetails(
       AccessibilityNotificationType notification_type,
       bool enabled,
-      ash::MagnifierType magnifier_type,
-      ash::AccessibilityNotificationVisibility notify);
+      ui::MagnifierType magnifier_type,
+      ui::AccessibilityNotificationVisibility notify);
 
   AccessibilityNotificationType notification_type;
   bool enabled;
-  ash::MagnifierType magnifier_type;
-  ash::AccessibilityNotificationVisibility notify;
+  ui::MagnifierType magnifier_type;
+  ui::AccessibilityNotificationVisibility notify;
 };
 
 typedef base::Callback<void(const AccessibilityStatusEventDetails&)>
@@ -73,8 +76,10 @@ typedef AccessibilityStatusCallbackList::Subscription
 class AccessibilityManager
     : public content::NotificationObserver,
       public extensions::api::braille_display_private::BrailleObserver,
-      public input_method::InputMethodManager::Observer,
-      public ash::SessionStateObserver {
+#if !defined(USE_ATHENA)
+      public ash::SessionStateObserver,
+#endif
+      public input_method::InputMethodManager::Observer {
  public:
   // Creates an instance of AccessibilityManager, this should be called once,
   // because only one instance should exist at the same time.
@@ -126,13 +131,13 @@ class AccessibilityManager
   // Enables or disables spoken feedback. Enabling spoken feedback installs the
   // ChromeVox component extension.
   void EnableSpokenFeedback(bool enabled,
-                            ash::AccessibilityNotificationVisibility notify);
+                            ui::AccessibilityNotificationVisibility notify);
 
   // Returns true if spoken feedback is enabled, or false if not.
   bool IsSpokenFeedbackEnabled();
 
   // Toggles whether Chrome OS spoken feedback is on or off.
-  void ToggleSpokenFeedback(ash::AccessibilityNotificationVisibility notify);
+  void ToggleSpokenFeedback(ui::AccessibilityNotificationVisibility notify);
 
   // Enables or disables the high contrast mode for Chrome.
   void EnableHighContrast(bool enabled);
@@ -161,8 +166,10 @@ class AccessibilityManager
   // false.
   bool IsBrailleDisplayConnected() const;
 
+#if !defined(USE_ATHENA)
   // SessionStateObserver overrides:
   virtual void ActiveUserChanged(const std::string& user_id) override;
+#endif
 
   void SetProfileForTest(Profile* profile);
 
@@ -254,7 +261,9 @@ class AccessibilityManager
   content::NotificationRegistrar notification_registrar_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_pref_change_registrar_;
+#if !defined(USE_ATHENA)
   scoped_ptr<ash::ScopedSessionStateObserver> session_state_observer_;
+#endif
 
   PrefHandler large_cursor_pref_handler_;
   PrefHandler spoken_feedback_pref_handler_;
@@ -271,7 +280,7 @@ class AccessibilityManager
   int autoclick_delay_ms_;
   bool virtual_keyboard_enabled_;
 
-  ash::AccessibilityNotificationVisibility spoken_feedback_notification_;
+  ui::AccessibilityNotificationVisibility spoken_feedback_notification_;
 
   bool should_speak_chrome_vox_announcements_on_user_screen_;