Remove dependency on NotificationService for cros a11y settings.

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h

Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
index c60eccc231ce85ff017f75bac04dea70d4258eb5..384e74992bea3fa3c3ebd1e8f7e45567e06fe8e8 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h
@@ -7,11 +7,10 @@
 
 #include <string>
 
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
 #include "chrome/browser/chromeos/login/version_info_updater.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 
 namespace base {
 class ListValue;
@@ -24,7 +23,6 @@ class OobeUI;
 // The core handler for Javascript messages related to the "oobe" view.
 class CoreOobeHandler : public BaseScreenHandler,
                         public VersionInfoUpdater::Delegate,
-                        public content::NotificationObserver,
                         public CoreOobeActor {
  public:
   class Delegate {
@@ -103,10 +101,9 @@ class CoreOobeHandler : public BaseScreenHandler,
   // Updates the device requisition string on the UI side.
   void UpdateDeviceRequisition();
 
-  // content::NotificationObserver implementation:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // Notification of a change in the accessibility settings.
+  void OnAccessibilityStatusChanged(
+      const AccessibilityStatusEventDetails& details);
 
   // Owner of this handler.
   OobeUI* oobe_ui_;
@@ -121,6 +118,8 @@ class CoreOobeHandler : public BaseScreenHandler,
 
   content::NotificationRegistrar registrar_;

[Nikita (slow), 2014/02/20 10:39:04]

NotificationRegistrar not needed anymore.

[kevers, 2014/02/20 17:00:49]

Removed

 
+  scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
+
   DISALLOW_COPY_AND_ASSIGN(CoreOobeHandler);
 };