Cleanup: remove NotifyAccessibilityEvent from views::Widget.

BUG=none


Review URL: https://chromiumcodereview.appspot.com/13524005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192951 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 30 insertions, 73 deletions

diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc
index e0f6ca9..60b3a0c 100644
--- a/ui/app_list/views/apps_grid_view.cc
+++ b/ui/app_list/views/apps_grid_view.cc
@@ -406,10 +406,8 @@ void AppsGridView::SetSelectedItemByIndex(const Index& index) {
   EnsureViewVisible(new_selection);
   selected_view_ = new_selection;
   selected_view_->SchedulePaint();
-  if (GetWidget()) {
-    GetWidget()->NotifyAccessibilityEvent(
-        selected_view_, ui::AccessibilityTypes::EVENT_FOCUS, true);
-  }
+  selected_view_->NotifyAccessibilityEvent(
+      ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
 bool AppsGridView::IsValidIndex(const Index& index) const {
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index f9901dd..bd5124c 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -84,10 +84,8 @@ void CustomButton::SetHotTracked(bool is_hot_tracked) {
   if (state_ != STATE_DISABLED)
     SetState(is_hot_tracked ? STATE_HOVERED : STATE_NORMAL);
 
-  if (is_hot_tracked && GetWidget()) {
-    GetWidget()->NotifyAccessibilityEvent(
-        this, ui::AccessibilityTypes::EVENT_FOCUS, true);
-  }
+  if (is_hot_tracked)
+    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
 bool CustomButton::IsHotTracked() const {
diff --git a/ui/views/controls/button/image_button.cc b/ui/views/controls/button/image_button.cc
index ca0bfc7b..df74249 100644
--- a/ui/views/controls/button/image_button.cc
+++ b/ui/views/controls/button/image_button.cc
@@ -165,8 +165,7 @@ void ToggleImageButton::SetToggled(bool toggled) {
   toggled_ = toggled;
   SchedulePaint();
 
-  GetWidget()->NotifyAccessibilityEvent(
-      this, ui::AccessibilityTypes::EVENT_VALUE_CHANGED, true);
+  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_VALUE_CHANGED, true);
 }
 
 void ToggleImageButton::SetToggledImage(ButtonState state,
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
index 85b5ba2..78d2105 100644
--- a/ui/views/controls/combobox/combobox.cc
+++ b/ui/views/controls/combobox/combobox.cc
@@ -58,10 +58,7 @@ void Combobox::SelectionChanged() {
   selected_index_ = native_wrapper_->GetSelectedIndex();
   if (listener_)
     listener_->OnSelectedIndexChanged(this);
-  if (GetWidget()) {
-    GetWidget()->NotifyAccessibilityEvent(
-        this, ui::AccessibilityTypes::EVENT_VALUE_CHANGED, false);
-  }
+  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_VALUE_CHANGED, false);
 }
 
 void Combobox::SetAccessibleName(const string16& name) {
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 0f8ad80..a27e99a 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -812,8 +812,8 @@ void MenuController::SetSelection(MenuItemView* menu_item,
   if (menu_item &&
       (MenuDepth(menu_item) != 1 ||
        menu_item->GetType() != MenuItemView::SUBMENU)) {
-    menu_item->GetWidget()->NotifyAccessibilityEvent(
-        menu_item, ui::AccessibilityTypes::EVENT_FOCUS, true);
+    menu_item->NotifyAccessibilityEvent(
+        ui::AccessibilityTypes::EVENT_FOCUS, true);
   }
 }
 
diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc
index 2c7bdc8..86a5afc 100644
--- a/ui/views/controls/menu/submenu_view.cc
+++ b/ui/views/controls/menu/submenu_view.cc
@@ -313,12 +313,10 @@ void SubmenuView::ShowAt(Widget* parent,
     host_->InitMenuHost(parent, bounds, scroll_view_container_, do_capture);
   }
 
-  GetScrollViewContainer()->GetWidget()->NotifyAccessibilityEvent(
-      GetScrollViewContainer(),
+  GetScrollViewContainer()->NotifyAccessibilityEvent(
       ui::AccessibilityTypes::EVENT_MENUSTART,
       true);
-  GetWidget()->NotifyAccessibilityEvent(
-      this,
+  NotifyAccessibilityEvent(
       ui::AccessibilityTypes::EVENT_MENUPOPUPSTART,
       true);
 }
@@ -330,14 +328,9 @@ void SubmenuView::Reposition(const gfx::Rect& bounds) {
 
 void SubmenuView::Close() {
   if (host_) {
-    GetWidget()->NotifyAccessibilityEvent(
-        this,
-        ui::AccessibilityTypes::EVENT_MENUPOPUPEND,
-        true);
-    GetScrollViewContainer()->GetWidget()->NotifyAccessibilityEvent(
-        GetScrollViewContainer(),
-        ui::AccessibilityTypes::EVENT_MENUEND,
-        true);
+    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_MENUPOPUPEND, true);
+    GetScrollViewContainer()->NotifyAccessibilityEvent(
+        ui::AccessibilityTypes::EVENT_MENUEND, true);
 
     host_->DestroyMenuHost();
     host_ = NULL;
diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index d4efc45..34c8705 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -132,8 +132,7 @@ void MessageBoxView::ViewHierarchyChanged(bool is_add,
     if (prompt_field_)
       prompt_field_->SelectAll(true);
 
-    GetWidget()->NotifyAccessibilityEvent(
-        this, ui::AccessibilityTypes::EVENT_ALERT, true);
+    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }
 
diff --git a/ui/views/controls/native/native_view_host.cc b/ui/views/controls/native/native_view_host.cc
index 736ff61..d30e285 100644
--- a/ui/views/controls/native/native_view_host.cc
+++ b/ui/views/controls/native/native_view_host.cc
@@ -163,8 +163,7 @@ std::string NativeViewHost::GetClassName() const {
 
 void NativeViewHost::OnFocus() {
   native_wrapper_->SetFocus();
-  GetWidget()->NotifyAccessibilityEvent(
-      this, ui::AccessibilityTypes::EVENT_FOCUS, true);
+  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
 gfx::NativeViewAccessible NativeViewHost::GetNativeViewAccessible() {
diff --git a/ui/views/controls/native_control.cc b/ui/views/controls/native_control.cc
index 453a52c..8fb697a 100644
--- a/ui/views/controls/native_control.cc
+++ b/ui/views/controls/native_control.cc
@@ -279,10 +279,7 @@ void NativeControl::OnFocus() {
   if (container_) {
     DCHECK(container_->GetControl());
     ::SetFocus(container_->GetControl());
-    if (GetWidget()) {
-      GetWidget()->NotifyAccessibilityEvent(
-          this, ui::AccessibilityTypes::EVENT_FOCUS, false);
-    }
+    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, false);
   }
 }
 
diff --git a/ui/views/controls/native_control_win.cc b/ui/views/controls/native_control_win.cc
index b16ffd1..32a06ba 100644
--- a/ui/views/controls/native_control_win.cc
+++ b/ui/views/controls/native_control_win.cc
@@ -113,10 +113,8 @@ void NativeControlWin::OnFocus() {
       parent_view->HasFocus();
 
   // Send the accessibility focus notification.
-  if (parent_view->GetWidget()) {
-    parent_view->GetWidget()->NotifyAccessibilityEvent(
-        parent_view, ui::AccessibilityTypes::EVENT_FOCUS, send_native_event);
-  }
+  parent_view->NotifyAccessibilityEvent(
+      ui::AccessibilityTypes::EVENT_FOCUS, send_native_event);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
index b6d07e1..8c82ea3 100644
--- a/ui/views/controls/slider.cc
+++ b/ui/views/controls/slider.cc
@@ -103,8 +103,8 @@ void Slider::SetValueInternal(float value, SliderChangeReason reason) {
     SchedulePaint();
   }
   if (accessibility_events_enabled_ && GetWidget()) {
-    GetWidget()->NotifyAccessibilityEvent(
-        this, ui::AccessibilityTypes::EVENT_VALUE_CHANGED, true);
+    NotifyAccessibilityEvent(
+        ui::AccessibilityTypes::EVENT_VALUE_CHANGED, true);
   }
 }
 
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index dfcce80..2cf72dd8 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -359,8 +359,8 @@ void TabbedPane::OnFocus() {
 
   View* selected_tab = GetSelectedTab();
   if (selected_tab) {
-    selected_tab->GetWidget()->NotifyAccessibilityEvent(
-        selected_tab, ui::AccessibilityTypes::EVENT_FOCUS, true);
+    selected_tab->NotifyAccessibilityEvent(
+        ui::AccessibilityTypes::EVENT_FOCUS, true);
   }
 }
 
diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc
index 29ff227..54cb7a2 100644
--- a/ui/views/controls/textfield/native_textfield_views.cc
+++ b/ui/views/controls/textfield/native_textfield_views.cc
@@ -474,8 +474,8 @@ void NativeTextfieldViews::UpdateText() {
   model_->SetText(GetTextForDisplay(textfield_->text()));
   OnCaretBoundsChanged();
   SchedulePaint();
-  textfield_->GetWidget()->NotifyAccessibilityEvent(
-      textfield_, ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
+  textfield_->NotifyAccessibilityEvent(
+      ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
 }
 
 void NativeTextfieldViews::AppendText(const string16& text) {
@@ -621,8 +621,8 @@ void NativeTextfieldViews::SelectRange(const ui::Range& range) {
   model_->SelectRange(range);
   OnCaretBoundsChanged();
   SchedulePaint();
-  textfield_->GetWidget()->NotifyAccessibilityEvent(
-      textfield_, ui::AccessibilityTypes::EVENT_SELECTION_CHANGED, true);
+  textfield_->NotifyAccessibilityEvent(
+      ui::AccessibilityTypes::EVENT_SELECTION_CHANGED, true);
 }
 
 gfx::SelectionModel NativeTextfieldViews::GetSelectionModel() const {
@@ -1222,8 +1222,8 @@ void NativeTextfieldViews::UpdateAfterChange(bool text_changed,
                                              bool cursor_changed) {
   if (text_changed) {
     PropagateTextChange();
-    textfield_->GetWidget()->NotifyAccessibilityEvent(
-        textfield_, ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
+    textfield_->NotifyAccessibilityEvent(
+        ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
   }
   if (cursor_changed) {
     is_cursor_visible_ = true;
@@ -1231,8 +1231,8 @@ void NativeTextfieldViews::UpdateAfterChange(bool text_changed,
     if (!text_changed) {
       // TEXT_CHANGED implies SELECTION_CHANGED, so we only need to fire
       // this if only the selection changed.
-      textfield_->GetWidget()->NotifyAccessibilityEvent(
-          textfield_, ui::AccessibilityTypes::EVENT_SELECTION_CHANGED, true);
+      textfield_->NotifyAccessibilityEvent(
+          ui::AccessibilityTypes::EVENT_SELECTION_CHANGED, true);
     }
   }
   if (text_changed || cursor_changed) {
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index fbaf570..06a6686 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -897,15 +897,6 @@ void Widget::UpdateRootLayers() {
   root_layers_dirty_ = true;
 }
 
-void Widget::NotifyAccessibilityEvent(
-    View* view,
-    ui::AccessibilityTypes::Event event_type,
-    bool send_native_event) {
-  // TODO(dmazzoni): get rid of this method and have clients just use
-  // View::NotifyAccessibilityEvent directly.
-  view->NotifyAccessibilityEvent(event_type, send_native_event);
-}
-
 const NativeWidget* Widget::native_widget() const {
   return native_widget_;
 }
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 2d6e6aaf..a7db9ca 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -12,7 +12,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/native_widget_types.h"
@@ -588,17 +587,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   // GetRootLayers() is invoked.
   void UpdateRootLayers();
 
-  // Notifies assistive technology that an accessibility event has
-  // occurred on |view|, such as when the view is focused or when its
-  // value changes. Pass true for |send_native_event| except for rare
-  // cases where the view is a native control that's already sending a
-  // native accessibility event and the duplicate event would cause
-  // problems.
-  void NotifyAccessibilityEvent(
-      View* view,
-      ui::AccessibilityTypes::Event event_type,
-      bool send_native_event);
-
   const NativeWidget* native_widget() const;
   NativeWidget* native_widget();