Remove dependency on NotificationService for cros a11y settings.

chrome/browser/guestview/webview/webview_guest.cc

 // Copyright 2013 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/guestview/webview/webview_guest.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
@@ skipping 123 matching lines @@
       chromevox_injected_(false) {
   notification_registrar_.Add(
       this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
       content::Source<WebContents>(guest_web_contents));
 
   notification_registrar_.Add(
       this, content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
       content::Source<WebContents>(guest_web_contents));
 
 #if defined(OS_CHROMEOS)
-  notification_registrar_.Add(this,
-      chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK,
-      content::NotificationService::AllSources());
+  chromeos::AccessibilityManager* accessibility_manager =
+      chromeos::AccessibilityManager::Get();
+  CHECK(accessibility_manager);
+  accessibility_subscription_ = accessibility_manager->RegisterCallback(
+      base::Bind(&WebViewGuest::OnAccessibilityStatusChanged,
+                 base::Unretained(this)));
 #endif
 
   AttachWebViewHelpers(guest_web_contents);
 }
 
 // static
 WebViewGuest* WebViewGuest::From(int embedder_process_id,
                                  int guest_instance_id) {
   GuestView* guest = GuestView::From(embedder_process_id, guest_instance_id);
   if (!guest)
@@ skipping 325 matching lines @@
                 guest_web_contents());
       content::ResourceRedirectDetails* resource_redirect_details =
           content::Details<content::ResourceRedirectDetails>(details).ptr();
       bool is_top_level =
           resource_redirect_details->resource_type == ResourceType::MAIN_FRAME;
       LoadRedirect(resource_redirect_details->url,
                    resource_redirect_details->new_url,
                    is_top_level);
       break;
     }
-#if defined(OS_CHROMEOS)
-    case chrome::NOTIFICATION_CROS_ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK:
-      InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
-      break;
-#endif
     default:
       NOTREACHED() << "Unexpected notification sent.";
       break;
   }
 }
 
 void WebViewGuest::SetZoom(double zoom_factor) {
   double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
   guest_web_contents()->SetZoomLevel(zoom_level);
 
@@ skipping 250 matching lines @@
 void WebViewGuest::SizeChanged(const gfx::Size& old_size,
                                const gfx::Size& new_size) {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   args->SetInteger(webview::kOldHeight, old_size.height());
   args->SetInteger(webview::kOldWidth, old_size.width());
   args->SetInteger(webview::kNewHeight, new_size.height());
   args->SetInteger(webview::kNewWidth, new_size.width());
   DispatchEvent(new GuestView::Event(webview::kEventSizeChanged, args.Pass()));
 }
 
+#if defined(OS_CHROMEOS)
+void WebViewGuest::OnAccessibilityStatusChanged(
+    const chromeos::AccessibilityStatusEventDetails& details) {
+  if (details.notification_type == chromeos::ACCESSIBILITY_MANAGER_SHUTDOWN) {
+    accessibility_subscription_.reset();
+  } else if (details.notification_type ==
+      chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
+    InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
+  }
+}
+#endif
+
 void WebViewGuest::InjectChromeVoxIfNeeded(
     content::RenderViewHost* render_view_host) {
 #if defined(OS_CHROMEOS)
   if (!chromevox_injected_) {
     chromeos::AccessibilityManager* manager =
         chromeos::AccessibilityManager::Get();
     if (manager && manager->IsSpokenFeedbackEnabled()) {
       manager->InjectChromeVox(render_view_host);
       chromevox_injected_ = true;
     }
@@ skipping 10 matching lines @@
     const PermissionResponseCallback& callback,
     BrowserPluginPermissionType permission_type,
     bool allowed_by_default)
     : callback(callback),
       permission_type(permission_type),
       allowed_by_default(allowed_by_default) {
 }
 
 WebViewGuest::PermissionResponseInfo::~PermissionResponseInfo() {
 }