Remove notifications from Accessibility API

chrome/browser/accessibility/accessibility_extension_api.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/accessibility/accessibility_extension_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
@@ skipping 25 matching lines @@
   return args.Pass();
 }
 
 ExtensionAccessibilityEventRouter*
     ExtensionAccessibilityEventRouter::GetInstance() {
   return Singleton<ExtensionAccessibilityEventRouter>::get();
 }
 
 ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
     : enabled_(false) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
-                 content::NotificationService::AllSources());
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
-                 content::NotificationService::AllSources());
 }
 
 ExtensionAccessibilityEventRouter::~ExtensionAccessibilityEventRouter() {
-}
-
-void ExtensionAccessibilityEventRouter::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED:
-      OnWindowOpened(
-          content::Details<const AccessibilityWindowInfo>(details).ptr());
-      break;
-    case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED:
-      OnWindowClosed(
-          content::Details<const AccessibilityWindowInfo>(details).ptr());
-      break;
-    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED:
-      OnControlFocused(
-          content::Details<const AccessibilityControlInfo>(details).ptr());
-      break;
-    case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION:
-      OnControlAction(
-          content::Details<const AccessibilityControlInfo>(details).ptr());
-      break;
-    case chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED:
-      OnTextChanged(
-          content::Details<const AccessibilityControlInfo>(details).ptr());
-      break;
-    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED:
-      OnMenuOpened(
-          content::Details<const AccessibilityMenuInfo>(details).ptr());
-      break;
-    case chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED:
-      OnMenuClosed(
-          content::Details<const AccessibilityMenuInfo>(details).ptr());
-      break;
-    default:
-      NOTREACHED();
-  }
+  control_event_callback_.Reset();
 }
 
 void ExtensionAccessibilityEventRouter::SetAccessibilityEnabled(bool enabled) {
   enabled_ = enabled;
 }
 
 bool ExtensionAccessibilityEventRouter::IsAccessibilityEnabled() const {
   return enabled_;
 }
 
+void ExtensionAccessibilityEventRouter::SetControlEventCallbackForTesting(
+    ControlEventCallback control_event_callback) {
+  DCHECK(control_event_callback_.is_null());
+  control_event_callback_ = control_event_callback;
+}
+void ExtensionAccessibilityEventRouter::ClearControlEventCallback() {
+  control_event_callback_.Reset();
+}
+
+void ExtensionAccessibilityEventRouter::HandleWindowEvent(
+    ui::AccessibilityTypes::Event event,
+    const AccessibilityWindowInfo* info) {
+  if (event == ui::AccessibilityTypes::EVENT_ALERT)
+    OnWindowOpened(info);
+}
+
+void ExtensionAccessibilityEventRouter::HandleMenuEvent(
+    ui::AccessibilityTypes::Event event,
+    const AccessibilityMenuInfo* info) {
+  switch (event) {
+    case ui::AccessibilityTypes::EVENT_MENUSTART:
+    case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART:
+      OnMenuOpened(info);
+      break;
+    case ui::AccessibilityTypes::EVENT_MENUEND:
+    case ui::AccessibilityTypes::EVENT_MENUPOPUPEND:
+      OnMenuClosed(info);
+      break;
+    default:
+      NOTREACHED();
+  }
+}
+
+void ExtensionAccessibilityEventRouter::HandleControlEvent(
+    ui::AccessibilityTypes::Event event,
+    const AccessibilityControlInfo* info) {
+  if (!control_event_callback_.is_null())
+    control_event_callback_.Run(event, info);
+
+  switch (event) {
+    case ui::AccessibilityTypes::EVENT_TEXT_CHANGED:
+    case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED:
+      OnTextChanged(info);
+      break;
+    case ui::AccessibilityTypes::EVENT_VALUE_CHANGED:
+      OnControlAction(info);
+      break;
+    case ui::AccessibilityTypes::EVENT_FOCUS:
+      OnControlFocused(info);
+      break;
+    default:
+      NOTREACHED();
+  }
+}
+
 void ExtensionAccessibilityEventRouter::OnWindowOpened(
     const AccessibilityWindowInfo* info) {
   scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(), keys::kOnWindowOpened, args.Pass());
 }
 
-void ExtensionAccessibilityEventRouter::OnWindowClosed(

[dmazzoni, 2013/08/14 19:36:37]

Was this never used?

[Cait (Slow), 2013/08/14 20:53:36]

Not as far as I can tell. Looks like support for the ACCESSIBILITY_WINDOW_OPENED
notification was added in r91913, but ACCESSIBILITY_WINDOW_CLOSED was never
hooked up (currently the notification is never fired).

-    const AccessibilityWindowInfo* info) {
-  scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
-  DispatchEvent(info->profile(), keys::kOnWindowClosed, args.Pass());
-}
-
 void ExtensionAccessibilityEventRouter::OnControlFocused(
     const AccessibilityControlInfo* info) {
   last_focused_control_dict_.Clear();
   info->SerializeToDict(&last_focused_control_dict_);
   scoped_ptr<ListValue> args(ControlInfoToEventArguments(info));
   DispatchEvent(info->profile(), keys::kOnControlFocused, args.Pass());
 }
 
 void ExtensionAccessibilityEventRouter::OnControlAction(
     const AccessibilityControlInfo* info) {
@@ skipping 95 matching lines @@
       DictionaryValue* alert_value = new DictionaryValue;
       const string16 message_text = confirm_infobar_delegate->GetMessageText();
       alert_value->SetString(keys::kMessageKey, message_text);
       alerts_value->Append(alert_value);
     }
   }
 
   SetResult(alerts_value);
   return true;
 }