Remove notifications from Accessibility API

chrome/browser/ui/views/accessibility/accessibility_event_router_views.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/ui/views/accessibility/accessibility_event_router_views.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 30 matching lines @@
   return Singleton<AccessibilityEventRouterViews>::get();
 }
 
 void AccessibilityEventRouterViews::HandleAccessibilityEvent(
     views::View* view, ui::AccessibilityTypes::Event event_type) {
   if (!ExtensionAccessibilityEventRouter::GetInstance()->
       IsAccessibilityEnabled()) {
     return;
   }
 
-  chrome::NotificationType notification_type;
-  switch (event_type) {
-    case ui::AccessibilityTypes::EVENT_FOCUS:
-      notification_type = chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED;
-      break;
-    case ui::AccessibilityTypes::EVENT_MENUSTART:
-    case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART:
-      notification_type = chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED;
-      break;
-    case ui::AccessibilityTypes::EVENT_MENUEND:
-    case ui::AccessibilityTypes::EVENT_MENUPOPUPEND:
-      notification_type = chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED;
-      break;
-    case ui::AccessibilityTypes::EVENT_TEXT_CHANGED:
-    case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED:
-      // These two events should only be sent for views that have focus. This
-      // enforces the invariant that we fire events triggered by user action and
-      // not by programmatic logic. For example, the location bar can be updated
-      // by javascript while the user focus is within some other part of the
-      // user interface. In contrast, the other supported events here do not
-      // depend on focus. For example, a menu within a menubar can open or close
-      // while focus is within the location bar or anywhere else as a result of
-      // user action. Note that the below logic can at some point be removed if
-      // we pass more information along to the listener such as focused state.
-      if (!view->GetFocusManager() ||
-          view->GetFocusManager()->GetFocusedView() != view)
-        return;
-      notification_type = chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED;
-      break;
-    case ui::AccessibilityTypes::EVENT_VALUE_CHANGED:
-      notification_type = chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION;
-      break;
-    case ui::AccessibilityTypes::EVENT_ALERT:
-      notification_type = chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED;
-      break;
-    case ui::AccessibilityTypes::EVENT_NAME_CHANGED:
-    default:
-      NOTIMPLEMENTED();
+  if (event_type == ui::AccessibilityTypes::EVENT_TEXT_CHANGED ||
+      event_type == ui::AccessibilityTypes::EVENT_SELECTION_CHANGED) {
+    // These two events should only be sent for views that have focus. This
+    // enforces the invariant that we fire events triggered by user action and
+    // not by programmatic logic. For example, the location bar can be updated
+    // by javascript while the user focus is within some other part of the
+    // user interface. In contrast, the other supported events here do not
+    // depend on focus. For example, a menu within a menubar can open or close
+    // while focus is within the location bar or anywhere else as a result of
+    // user action. Note that the below logic can at some point be removed if
+    // we pass more information along to the listener such as focused state.
+    if (!view->GetFocusManager() ||
+        view->GetFocusManager()->GetFocusedView() != view)
       return;
   }
 
   // Don't dispatch the accessibility event until the next time through the
   // event loop, to handle cases where the view's state changes after
   // the call to post the event. It's safe to use base::Unretained(this)
   // because AccessibilityEventRouterViews is a singleton.
   views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
   int view_storage_id = view_storage->CreateStorageID();
   view_storage->StoreView(view_storage_id, view);
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(
           &AccessibilityEventRouterViews::DispatchNotificationOnViewStorageId,
           view_storage_id,
-          notification_type));
+          event_type));
 }
 
 void AccessibilityEventRouterViews::HandleMenuItemFocused(
     const string16& menu_name,
     const string16& menu_item_name,
     int item_index,
     int item_count,
     bool has_submenu) {
   if (!ExtensionAccessibilityEventRouter::GetInstance()->
       IsAccessibilityEnabled()) {
     return;
   }
 
   if (!most_recent_profile_)
     return;
 
   AccessibilityMenuItemInfo info(most_recent_profile_,
                                  UTF16ToUTF8(menu_item_name),
                                  UTF16ToUTF8(menu_name),
                                  has_submenu,
                                  item_index,
                                  item_count);
-  SendAccessibilityNotification(
-      chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED, &info);
+  SendControlAccessibilityNotification(
+      ui::AccessibilityTypes::EVENT_FOCUS, &info);
 }
 
 void AccessibilityEventRouterViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_PROFILE_DESTROYED);
   Profile* profile = content::Source<Profile>(source).ptr();
   if (profile == most_recent_profile_)
     most_recent_profile_ = NULL;
 }
 
 //
 // Private methods
 //
 
 void AccessibilityEventRouterViews::DispatchNotificationOnViewStorageId(
     int view_storage_id,
-    chrome::NotificationType type) {
+    ui::AccessibilityTypes::Event type) {
   views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
   views::View* view = view_storage->RetrieveView(view_storage_id);
   view_storage->RemoveView(view_storage_id);
   if (!view)
     return;
 
   AccessibilityEventRouterViews* instance =
       AccessibilityEventRouterViews::GetInstance();
   instance->DispatchAccessibilityNotification(view, type);
 }
 
 void AccessibilityEventRouterViews::DispatchAccessibilityNotification(
-    views::View* view, chrome::NotificationType type) {
+    views::View* view, ui::AccessibilityTypes::Event type) {
   // Get the profile associated with this view. If it's not found, use
   // the most recent profile where accessibility events were sent, or
   // the default profile.
   Profile* profile = NULL;
   views::Widget* widget = view->GetWidget();
   if (widget) {
     profile = reinterpret_cast<Profile*>(
         widget->GetNativeWindowProperty(Profile::kProfileKey));
   }
   if (!profile)
     profile = most_recent_profile_;
   if (!profile) {
     if (g_browser_process->profile_manager())
       profile = g_browser_process->profile_manager()->GetLastUsedProfile();
   }
   if (!profile) {
     LOG(WARNING) << "Accessibility notification but no profile";
     return;
   }
 
   most_recent_profile_ = profile;
 
-  if (type == chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED ||
-      type == chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED) {
+  if (type == ui::AccessibilityTypes::EVENT_MENUSTART ||
+      type == ui::AccessibilityTypes::EVENT_MENUPOPUPSTART ||
+      type == ui::AccessibilityTypes::EVENT_MENUEND ||
+      type == ui::AccessibilityTypes::EVENT_MENUPOPUPEND) {
     SendMenuNotification(view, type, profile);
     return;
   }
 
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
 
   switch (state.role) {
   case ui::AccessibilityTypes::ROLE_ALERT:
   case ui::AccessibilityTypes::ROLE_WINDOW:
@@ skipping 32 matching lines @@
   default:
     // If this is encountered, please file a bug with the role that wasn't
     // caught so we can add accessibility extension API support.
     NOTREACHED();
   }
 }
 
 // static
 void AccessibilityEventRouterViews::SendButtonNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   AccessibilityButtonInfo info(
       profile, GetViewName(view), GetViewContext(view));
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendLinkNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   AccessibilityLinkInfo info(profile, GetViewName(view), GetViewContext(view));
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendMenuNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   AccessibilityMenuInfo info(profile, GetViewName(view));
-  SendAccessibilityNotification(type, &info);
+  SendMenuAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendMenuItemNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   std::string name = GetViewName(view);
   std::string context = GetViewContext(view);
 
   bool has_submenu = false;
   int index = -1;
   int count = -1;
 
   if (!strcmp(view->GetClassName(), views::MenuItemView::kViewClassName))
     has_submenu = static_cast<views::MenuItemView*>(view)->HasSubmenu();
 
   views::View* parent_menu = view->parent();
   while (parent_menu != NULL && strcmp(parent_menu->GetClassName(),
                                        views::SubmenuView::kViewClassName)) {
     parent_menu = parent_menu->parent();
   }
   if (parent_menu) {
     count = 0;
     RecursiveGetMenuItemIndexAndCount(parent_menu, view, &index, &count);
   }
 
   AccessibilityMenuItemInfo info(
       profile, name, context, has_submenu, index, count);
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendTextfieldNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   std::string name = UTF16ToUTF8(state.name);
   std::string context = GetViewContext(view);
   bool password =
       (state.state & ui::AccessibilityTypes::STATE_PROTECTED) != 0;
   AccessibilityTextBoxInfo info(profile, name, context, password);
   std::string value = UTF16ToUTF8(state.value);
   info.SetValue(value, state.selection_start, state.selection_end);
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendComboboxNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   std::string name = UTF16ToUTF8(state.name);
   std::string value = UTF16ToUTF8(state.value);
   std::string context = GetViewContext(view);
   AccessibilityComboBoxInfo info(
       profile, name, context, value, state.index, state.count);
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendCheckboxNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   std::string name = UTF16ToUTF8(state.name);
   std::string value = UTF16ToUTF8(state.value);
   std::string context = GetViewContext(view);
   AccessibilityCheckboxInfo info(
       profile,
       name,
       context,
       state.state == ui::AccessibilityTypes::STATE_CHECKED);
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendWindowNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   std::string window_text;
 
   // If it's an alert, try to get the text from the contents of the
   // static text, not the window title.
   if (state.role == ui::AccessibilityTypes::ROLE_ALERT)
     window_text = RecursiveGetStaticText(view);
 
   // Otherwise get it from the window's accessible name.
   if (window_text.empty())
     window_text = UTF16ToUTF8(state.name);
 
   AccessibilityWindowInfo info(profile, window_text);
-  SendAccessibilityNotification(type, &info);
+  SendWindowAccessibilityNotification(type, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendSliderNotification(
     views::View* view,
-    int type,
+    ui::AccessibilityTypes::Event type,
     Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
 
   std::string name = UTF16ToUTF8(state.name);
   std::string value = UTF16ToUTF8(state.value);
   std::string context = GetViewContext(view);
   AccessibilitySliderInfo info(
       profile,
       name,
       context,
       value);
-  SendAccessibilityNotification(type, &info);
+  SendControlAccessibilityNotification(type, &info);
 }
 
 // static
 std::string AccessibilityEventRouterViews::GetViewName(views::View* view) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   return UTF16ToUTF8(state.name);
 }
 
 // static
@@ skipping 108 matching lines @@
     return UTF16ToUTF8(state.name);
 
   for (int i = 0; i < view->child_count(); ++i) {
     views::View* child = view->child_at(i);
     std::string result = RecursiveGetStaticText(child);
     if (!result.empty())
       return result;
   }
   return std::string();
 }