Remove dependency on NotificationService for cros a11y settings.

chrome/browser/chromeos/login/wizard_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #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"
 #include "base/memory/weak_ptr.h"
 #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"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 }
 
@@ skipping 11 matching lines @@
 class OobeDisplay;
 class ResetScreen;
 class TermsOfServiceScreen;
 class UpdateScreen;
 class UserImageScreen;
 class WizardScreen;
 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 {
    public:
     // Called before a screen change happens.
     virtual void OnScreenChanged(WizardScreen* next_screen) = 0;
 
     // Called after the browser session has started.
     virtual void OnSessionStart() = 0;
   };
@@ skipping 156 matching lines @@
   virtual void OnExit(ExitCodes exit_code) OVERRIDE;
   virtual void ShowCurrentScreen() OVERRIDE;
   virtual void OnSetUserNamePassword(const std::string& username,
                                      const std::string& password) OVERRIDE;
   virtual void SetUsageStatisticsReporting(bool val) OVERRIDE;
   virtual bool GetUsageStatisticsReporting() const OVERRIDE;
   virtual ErrorScreen* GetErrorScreen() OVERRIDE;
   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);
 
   // Switches from one screen to another with delay before showing. Calling
   // ShowCurrentScreen directly forces screen to be shown immediately.
   void SetCurrentScreenSmooth(WizardScreen* screen, bool use_smoothing);
 
   // Changes status area visibility.
   void SetStatusAreaVisible(bool visible);
@@ skipping 91 matching lines @@
 
   // Non-owning pointer to local state used for testing.
   static PrefService* local_state_for_testing_;
 
   FRIEND_TEST_ALL_PREFIXES(EnrollmentScreenTest, TestCancel);
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
   friend class WizardControllerFlowTest;
   friend class WizardInProcessBrowserTest;
   friend class WizardControllerBrokenLocalStateTest;
 
+  scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
+
   base::WeakPtrFactory<WizardController> weak_factory_;
 
-  content::NotificationRegistrar registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_