Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h

Issue 166273014: Remove dependency on NotificationService for cros a11y settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge ToT. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..465478bf9c68c0a4533062d19bf5b38cca5656f2 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_;
@@ -119,7 +116,7 @@ class CoreOobeHandler : public BaseScreenHandler,
Delegate* delegate_;
- content::NotificationRegistrar registrar_;
+ scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
DISALLOW_COPY_AND_ASSIGN(CoreOobeHandler);
};

Powered by Google App Engine
This is Rietveld 408576698