| Index: chrome/browser/ui/views/accessibility_event_router_views.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/accessibility_event_router_views.cc (revision 91771)
|
| +++ chrome/browser/ui/views/accessibility_event_router_views.cc (working copy)
|
| @@ -13,7 +13,7 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
|
| -#include "content/common/notification_type.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "ui/base/models/combobox_model.h"
|
| #include "ui/base/accessibility/accessible_view_state.h"
|
| #include "views/controls/button/checkbox.h"
|
| @@ -53,26 +53,26 @@
|
| switch (event_type) {
|
| case ui::AccessibilityTypes::EVENT_FOCUS:
|
| DispatchAccessibilityNotification(
|
| - view, NotificationType::ACCESSIBILITY_CONTROL_FOCUSED);
|
| + view, chrome::ACCESSIBILITY_CONTROL_FOCUSED);
|
| break;
|
| case ui::AccessibilityTypes::EVENT_MENUSTART:
|
| case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART:
|
| DispatchAccessibilityNotification(
|
| - view, NotificationType::ACCESSIBILITY_MENU_OPENED);
|
| + view, chrome::ACCESSIBILITY_MENU_OPENED);
|
| break;
|
| case ui::AccessibilityTypes::EVENT_MENUEND:
|
| case ui::AccessibilityTypes::EVENT_MENUPOPUPEND:
|
| DispatchAccessibilityNotification(
|
| - view, NotificationType::ACCESSIBILITY_MENU_CLOSED);
|
| + view, chrome::ACCESSIBILITY_MENU_CLOSED);
|
| break;
|
| case ui::AccessibilityTypes::EVENT_TEXT_CHANGED:
|
| case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED:
|
| DispatchAccessibilityNotification(
|
| - view, NotificationType::ACCESSIBILITY_TEXT_CHANGED);
|
| + view, chrome::ACCESSIBILITY_TEXT_CHANGED);
|
| break;
|
| case ui::AccessibilityTypes::EVENT_VALUE_CHANGED:
|
| DispatchAccessibilityNotification(
|
| - view, NotificationType::ACCESSIBILITY_CONTROL_ACTION);
|
| + view, chrome::ACCESSIBILITY_CONTROL_ACTION);
|
| break;
|
| case ui::AccessibilityTypes::EVENT_ALERT:
|
| case ui::AccessibilityTypes::EVENT_NAME_CHANGED:
|
| @@ -105,7 +105,7 @@
|
| item_index,
|
| item_count);
|
| SendAccessibilityNotification(
|
| - NotificationType::ACCESSIBILITY_CONTROL_FOCUSED, &info);
|
| + chrome::ACCESSIBILITY_CONTROL_FOCUSED, &info);
|
| }
|
|
|
| //
|
| @@ -144,8 +144,8 @@
|
| if (class_name == views::Checkbox::kViewClassName) {
|
| SendCheckboxNotification(view, type, profile);
|
| } else if (class_name == views::MenuButton::kViewClassName ||
|
| - type == NotificationType::ACCESSIBILITY_MENU_OPENED ||
|
| - type == NotificationType::ACCESSIBILITY_MENU_CLOSED) {
|
| + type == chrome::ACCESSIBILITY_MENU_OPENED ||
|
| + type == chrome::ACCESSIBILITY_MENU_CLOSED) {
|
| SendMenuNotification(view, type, profile);
|
| } else if (IsMenuEvent(view, type)) {
|
| SendMenuItemNotification(view, type, profile);
|
| @@ -229,8 +229,8 @@
|
|
|
| bool AccessibilityEventRouterViews::IsMenuEvent(
|
| views::View* view, NotificationType type) {
|
| - if (type == NotificationType::ACCESSIBILITY_MENU_OPENED ||
|
| - type == NotificationType::ACCESSIBILITY_MENU_CLOSED)
|
| + if (type == chrome::ACCESSIBILITY_MENU_OPENED ||
|
| + type == chrome::ACCESSIBILITY_MENU_CLOSED)
|
| return true;
|
|
|
| while (view) {
|
|
|