Remove notifications from Accessibility API

chrome/browser/ui/views/accessibility/accessibility_event_router_views.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_UI_VIEWS_ACCESSIBILITY_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/accessibility/accessibility_events.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/accessibility/accessibility_types.h"
 
 class Profile;
 
 template <typename T> struct DefaultSingletonTraits;
 
 namespace views {
 class View;
@@ skipping 38 matching lines @@
 
  private:
   friend struct DefaultSingletonTraits<AccessibilityEventRouterViews>;
 
   FRIEND_TEST_ALL_PREFIXES(AccessibilityEventRouterViewsTest,
                            TestFocusNotification);
 
   AccessibilityEventRouterViews();
   virtual ~AccessibilityEventRouterViews();
 
-  // Call DispatchAccessibilityNotification using a view storage id.
-  static void DispatchNotificationOnViewStorageId(
+  // Call DispatchAccessibilityEvent using a view storage id.
+  static void DispatchEventOnViewStorageId(
       int view_storage_id,
-      chrome::NotificationType type);
+      ui::AccessibilityTypes::Event type);

[Peter Kasting, 2013/08/15 20:47:59]

Nit: Should this now be called |event|?  (many places)

 
   // Checks the type of the view and calls one of the more specific
   // Send*Notification methods, below.
-  void DispatchAccessibilityNotification(
+  void DispatchAccessibilityEvent(
       views::View* view,
-      chrome::NotificationType type);
+      ui::AccessibilityTypes::Event type);
 
   // Each of these methods constructs an AccessibilityControlInfo object
   // and sends a notification of a specific accessibility event.
   static void SendButtonNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendLinkNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendMenuNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendMenuItemNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendTextfieldNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendComboboxNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendCheckboxNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendWindowNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
   static void SendSliderNotification(
       views::View* view,
-      int type,
+      ui::AccessibilityTypes::Event type,
       Profile* profile);
 
   // Return the name of a view.
   static std::string GetViewName(views::View* view);
 
   // Get the context of a view - the name of the enclosing group, toolbar, etc.
   static std::string GetViewContext(views::View* view);
 
   // Return a descendant of this view with a given accessible role, if found.
   static views::View* FindDescendantWithAccessibleRole(
       views::View* view,
       ui::AccessibilityTypes::Role role);
 
-  // Return true if it's an event on a menu.
-  static bool IsMenuEvent(views::View* view,
-                          int type);
-
   // Recursively explore all menu items of |menu| and return in |count|
   // the total number of items, and in |index| the 0-based index of
   // |item|, if found. Initialize |count| to zero before calling this
   // method. |index| will be unchanged if the item is not found, so
   // initialize it to -1 to detect this case.
   static void RecursiveGetMenuItemIndexAndCount(views::View* menu,
                                                 views::View* item,
                                                 int* index,
                                                 int* count);
 
   // Recursively explore the subviews and return the text from the first
   // subview with a role of STATIC_TEXT.
   static std::string RecursiveGetStaticText(views::View* view);
 
   // The profile associated with the most recent window event  - used to
   // figure out where to route a few events that can't be directly traced
   // to a window with a profile (like menu events).
   Profile* most_recent_profile_;
 
   // Notification registrar so we can clear most_recent_profile_ when a
   // profile is destroyed.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityEventRouterViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ACCESSIBILITY_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_