Remove dependency on NotificationService for cros a11y settings.

chrome/browser/chromeos/login/wizard_controller.h

Index: chrome/browser/chromeos/login/wizard_controller.h
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index b4140df4713d23f785c42a56f6c418855ce653a2..b836d05b1df1e7323468d36d12a1825da7b7eff7 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/callback_list.h"

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

I think this include is not needed here.

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

Removed.

 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -14,10 +15,9 @@
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/rect.h"
 #include "url/gurl.h"
 
@@ -49,8 +49,7 @@ class WrongHWIDScreen;
 
 // Class that manages control flow between wizard screens. Wizard controller
 // interacts with screen controllers to move the user between screens.
-class WizardController : public ScreenObserver,
-                         public content::NotificationObserver {
+class WizardController : public ScreenObserver {
  public:
   // Observes screen changes.
   class Observer {
@@ -227,10 +226,9 @@ class WizardController : public ScreenObserver,
   virtual void ShowErrorScreen() OVERRIDE;
   virtual void HideErrorScreen(WizardScreen* parent_screen) OVERRIDE;
 
-  // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // Notification of a change in the state of an accessibility setting.
+  void OnAccessibilityStatusChanged(
+    const AccessibilityStatusEventDetails& details);

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

nit: 4 spaces indent.

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

Done.

 
   // Switches from one screen to another.
   void SetCurrentScreen(WizardScreen* screen);
@@ -342,9 +340,9 @@ class WizardController : public ScreenObserver,
   friend class WizardInProcessBrowserTest;
   friend class WizardControllerBrokenLocalStateTest;
 
-  base::WeakPtrFactory<WizardController> weak_factory_;
+  scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
 
-  content::NotificationRegistrar registrar_;
+  base::WeakPtrFactory<WizardController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };