Remove dependency on NotificationService for cros a11y settings.

chrome/browser/chromeos/login/wizard_controller.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 118 matching lines @@
       is_out_of_box_(false),
       host_(host),
       oobe_display_(oobe_display),
       usage_statistics_reporting_(true),
       skip_update_enroll_after_eula_(false),
       login_screen_started_(false),
       user_image_screen_return_to_previous_hack_(false),
       weak_factory_(this) {
   DCHECK(default_controller_ == NULL);
   default_controller_ = this;
-
-  registrar_.Add(
-      this,
-      chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK,
-      content::NotificationService::AllSources());
+  AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
+  CHECK(accessibility_manager);
+  accessibility_subscription_ = accessibility_manager->RegisterCallback(
+      base::Bind(&WizardController::OnAccessibilityStatusChanged,
+                 base::Unretained(this)));
 }
 
 WizardController::~WizardController() {
   if (default_controller_ == this) {
     default_controller_ = NULL;
   } else {
     NOTREACHED() << "More than one controller are alive.";
   }
 }
 
@@ skipping 665 matching lines @@
   VLOG(1) << "Showing error screen.";
   SetCurrentScreen(GetErrorScreen());
 }
 
 void WizardController::HideErrorScreen(WizardScreen* parent_screen) {
   DCHECK(parent_screen);
   VLOG(1) << "Hiding error screen.";
   SetCurrentScreen(parent_screen);
 }
 
-void WizardController::Observe(int type,
-                               const content::NotificationSource& source,
-                               const content::NotificationDetails& details) {
-  if (type != chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
-    NOTREACHED();
+void WizardController::OnAccessibilityStatusChanged(
+    const AccessibilityStatusEventDetails& details) {
+  enum AccessibilityNotificationType type = details.notification_type;
+  if (type == ACCESSIBILITY_MANAGER_SHUTDOWN) {
+    accessibility_subscription_.reset();
+    return;
+  } else if (type != ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK || !details.enabled) {
     return;
   }
-  const AccessibilityStatusEventDetails* a11y_details =
-      content::Details<const AccessibilityStatusEventDetails>(details).ptr();
+
   CrasAudioHandler* cras = CrasAudioHandler::Get();
-  if (!a11y_details->enabled)
-    return;
   if (cras->IsOutputMuted()) {
     cras->SetOutputMute(false);
     cras->SetOutputVolumePercent(kMinAudibleOutputVolumePercent);
   } else if (cras->GetOutputVolumePercent() < kMinAudibleOutputVolumePercent) {
     cras->SetOutputVolumePercent(kMinAudibleOutputVolumePercent);
   }
 }
 
 void WizardController::AutoLaunchKioskApp() {
   KioskAppManager::App app_data;
@@ skipping 42 matching lines @@
   ShowErrorScreen();
 }
 
 PrefService* WizardController::GetLocalState() {
   if (local_state_for_testing_)
     return local_state_for_testing_;
   return g_browser_process->local_state();
 }
 
 }  // namespace chromeos