Refactor Views accessibility.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6581010

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

139 files changed, 1068 insertions, 884 deletions

diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
index 40c60cb5d..a498c36 100644
--- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
@@ -17,8 +17,9 @@
 #include "chrome/test/ui_test_utils.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 #include "views/window/window.h"
@@ -28,7 +29,7 @@ namespace {
 VARIANT id_self = {VT_I4, CHILDID_SELF};
 
 // Dummy class to force creation of ATL module, needed by COM to instantiate
-// ViewAccessibility.
+// NativeViewAccessibilityWin.
 class TestAtlModule : public CAtlDllModuleT<TestAtlModule> {};
 TestAtlModule test_atl_module_;
 
@@ -86,7 +87,9 @@ class BrowserViewsAccessibilityTest : public InProcessBrowserTest {
     ASSERT_TRUE(NULL != view);
 
     TestAccessibilityInfo(
-        ViewAccessibility::GetAccessibleForView(view), name, role);
+        views::NativeViewAccessibilityWin::GetAccessibleForView(view),
+        name,
+        role);
   }
 
 
@@ -253,8 +256,8 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest,
   EXPECT_STREQ(
       aboutChromeWindow->GetDelegate()->GetWindowTitle().c_str(),
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_TITLE)).c_str());
-  EXPECT_EQ(aboutChromeWindow->GetDelegate()->accessible_role(),
-            AccessibilityTypes::ROLE_DIALOG);
+  EXPECT_EQ(aboutChromeWindow->GetDelegate()->GetAccessibleRole(),
+            ui::AccessibilityTypes::ROLE_DIALOG);
 
   // Also test the accessibility object directly.
   IAccessible* acc_obj = NULL;
diff --git a/chrome/browser/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc
index 05cc6c0..48b59bf 100644
--- a/chrome/browser/autocomplete/autocomplete_accessibility.cc
+++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #include "views/view.h"
 
 HRESULT AutocompleteAccessibility::Initialize(
@@ -59,8 +59,8 @@ STDMETHODIMP AutocompleteAccessibility::get_accParent(IDispatch** disp_parent) {
   }
 
   // Retrieve the IDispatch interface for the parent view.
-  *disp_parent =
-      ViewAccessibility::GetAccessibleForView(edit_box_->parent_view());
+  *disp_parent = views::NativeViewAccessibilityWin::GetAccessibleForView(
+      edit_box_->parent_view());
   // Increment the reference count for the retrieved interface.
   (*disp_parent)->AddRef();
   return S_OK;
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
index 355d192..aa302e7 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc
@@ -20,6 +20,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/font.h"
@@ -271,6 +272,11 @@ void AutocompleteEditViewViews::Layout() {
                         height() - insets.height());
 }
 
+void AutocompleteEditViewViews::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditViewViews, AutocopmleteEditView implementation:
 
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.h b/chrome/browser/autocomplete/autocomplete_edit_view_views.h
index f58915b..fbc8b31 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_views.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.h
@@ -67,6 +67,7 @@ class AutocompleteEditViewViews : public views::View,
   // Implements views::View
   virtual bool OnMousePressed(const views::MouseEvent& event);
   virtual void Layout();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Implement the AutocompleteEditView interface.
   virtual AutocompleteEditModel* model();
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index 26fd11d..a4b4475 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -735,8 +735,10 @@ void AutocompleteEditViewWin::ClosePopup() {
 
 void AutocompleteEditViewWin::SetFocus() {
   ::SetFocus(m_hWnd);
-  parent_view_->
-      NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS, false);
+  parent_view_->GetWidget()->NotifyAccessibilityEvent(
+      parent_view_,
+      ui::AccessibilityTypes::EVENT_FOCUS,
+      false);
 }
 
 IAccessible* AutocompleteEditViewWin::GetIAccessible() {
@@ -906,12 +908,12 @@ bool AutocompleteEditViewWin::OnAfterPossibleChangeInternal(
   if (text_differs) {
     // Note that a TEXT_CHANGED event implies that the cursor/selection
     // probably changed too, so we don't need to send both.
-    parent_view_->NotifyAccessibilityEvent(
-        AccessibilityTypes::EVENT_TEXT_CHANGED);
+    parent_view_->GetWidget()->NotifyAccessibilityEvent(
+        parent_view_, ui::AccessibilityTypes::EVENT_TEXT_CHANGED, true);
   } else if (selection_differs) {
     // Notify assistive technology that the cursor or selection changed.
-    parent_view_->NotifyAccessibilityEvent(
-        AccessibilityTypes::EVENT_SELECTION_CHANGED);
+    parent_view_->GetWidget()->NotifyAccessibilityEvent(
+        parent_view_, ui::AccessibilityTypes::EVENT_SELECTION_CHANGED, true);
   } else if (delete_at_end_pressed_) {
     controller_->OnChanged();
   }
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 5e522f7..c3f1ec6 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -388,8 +388,8 @@ class DownloadTest : public InProcessBrowserTest {
     //  - Add a member function to the |DownloadShelf| interface class, that
     //    indicates how many members it has.
     //  - Add a member function to |DownloadShelf| to get the status text
-    //    of a given member (for example, via |DownloadItemView|'s
-    //    GetAccessibleName() member function), by index.
+    //    of a given member (for example, via the name in |DownloadItemView|'s
+    //    GetAccessibleState() member function), by index.
     //  - Iterate over browser->window()->GetDownloadShelf()'s members
     //    to see if any match the status text we want.  Start with the last one.
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 2a81d33..2bb8c48 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -42,7 +42,7 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #include "views/focus/focus_manager.h"
 #include "views/focus/focus_util_win.h"
 // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h!
@@ -587,9 +587,10 @@ void RenderWidgetHostViewWin::Show() {
 
   // Save away our HWND in the parent window as a property so that the
   // accessibility code can find it.
-  accessibility_prop_.reset(new ViewProp(GetParent(),
-                                         kViewsNativeHostPropForAccessibility,
-                                         m_hWnd));
+  accessibility_prop_.reset(new ViewProp(
+      GetParent(),
+      views::kViewsNativeHostPropForAccessibility,
+      m_hWnd));
 
   DidBecomeSelected();
 }
@@ -864,9 +865,10 @@ LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
                                 static_cast<RenderWidgetHostView*>(this)));
   // Save away our HWND in the parent window as a property so that the
   // accessibility code can find it.
-  accessibility_prop_.reset(new ViewProp(GetParent(),
-                                         kViewsNativeHostPropForAccessibility,
-                                         m_hWnd));
+  accessibility_prop_.reset(new ViewProp(
+      GetParent(),
+      views::kViewsNativeHostPropForAccessibility,
+      m_hWnd));
 
   return 0;
 }
diff --git a/chrome/browser/ui/views/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility_event_router_views.cc
index b296cac..5986d92 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/notification_type.h"
-#include "views/accessibility/accessibility_types.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/button/custom_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/native_button.h"
@@ -43,38 +43,38 @@ AccessibilityEventRouterViews* AccessibilityEventRouterViews::GetInstance() {
 }
 
 void AccessibilityEventRouterViews::HandleAccessibilityEvent(
-    views::View* view, AccessibilityTypes::Event event_type) {
+    views::View* view, ui::AccessibilityTypes::Event event_type) {
   if (!ExtensionAccessibilityEventRouter::GetInstance()->
       IsAccessibilityEnabled()) {
     return;
   }
 
   switch (event_type) {
-    case AccessibilityTypes::EVENT_FOCUS:
+    case ui::AccessibilityTypes::EVENT_FOCUS:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_CONTROL_FOCUSED);
       break;
-    case AccessibilityTypes::EVENT_MENUSTART:
-    case AccessibilityTypes::EVENT_MENUPOPUPSTART:
+    case ui::AccessibilityTypes::EVENT_MENUSTART:
+    case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_MENU_OPENED);
       break;
-    case AccessibilityTypes::EVENT_MENUEND:
-    case AccessibilityTypes::EVENT_MENUPOPUPEND:
+    case ui::AccessibilityTypes::EVENT_MENUEND:
+    case ui::AccessibilityTypes::EVENT_MENUPOPUPEND:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_MENU_CLOSED);
       break;
-    case AccessibilityTypes::EVENT_TEXT_CHANGED:
-    case AccessibilityTypes::EVENT_SELECTION_CHANGED:
+    case ui::AccessibilityTypes::EVENT_TEXT_CHANGED:
+    case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_TEXT_CHANGED);
       break;
-    case AccessibilityTypes::EVENT_VALUE_CHANGED:
+    case ui::AccessibilityTypes::EVENT_VALUE_CHANGED:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_CONTROL_ACTION);
       break;
-    case AccessibilityTypes::EVENT_ALERT:
-    case AccessibilityTypes::EVENT_NAME_CHANGED:
+    case ui::AccessibilityTypes::EVENT_ALERT:
+    case ui::AccessibilityTypes::EVENT_NAME_CHANGED:
       // TODO(dmazzoni): re-evaluate this list later and see
       // if supporting any of these would be useful feature requests or
       // they'd just be superfluous.
@@ -88,9 +88,9 @@ void AccessibilityEventRouterViews::HandleAccessibilityEvent(
 //
 
 std::string AccessibilityEventRouterViews::GetViewName(views::View* view) {
-  string16 wname;
-  view->GetAccessibleName(&wname);
-  return UTF16ToUTF8(wname);
+  ui::AccessibleViewState state;
+  view->GetAccessibleState(&state);
+  return UTF16ToUTF8(state.name);
 }
 
 void AccessibilityEventRouterViews::DispatchAccessibilityNotification(
@@ -202,9 +202,11 @@ bool AccessibilityEventRouterViews::IsMenuEvent(
     return true;
 
   while (view) {
-    AccessibilityTypes::Role role = view->GetAccessibleRole();
-    if (role == AccessibilityTypes::ROLE_MENUITEM ||
-        role == AccessibilityTypes::ROLE_MENUPOPUP) {
+    ui::AccessibleViewState state;
+    view->GetAccessibleState(&state);
+    ui::AccessibilityTypes::Role role = state.role;
+    if (role == ui::AccessibilityTypes::ROLE_MENUITEM ||
+        role == ui::AccessibilityTypes::ROLE_MENUPOPUP) {
       return true;
     }
     view = view->parent();
diff --git a/chrome/browser/ui/views/accessibility_event_router_views.h b/chrome/browser/ui/views/accessibility_event_router_views.h
index 77b256d..6dfdf78 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views.h
+++ b/chrome/browser/ui/views/accessibility_event_router_views.h
@@ -13,7 +13,7 @@
 #include "base/singleton.h"
 #include "base/task.h"
 #include "chrome/browser/accessibility_events.h"
-#include "views/accessibility/accessibility_types.h"
+#include "ui/base/accessibility/accessibility_types.h"
 
 class Profile;
 namespace views {
@@ -54,7 +54,7 @@ class AccessibilityEventRouterViews {
 
   // Handle an accessibility event generated by a view.
   void HandleAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type);
+      views::View* view, ui::AccessibilityTypes::Event event_type);
 
  private:
   AccessibilityEventRouterViews();
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index caecfbb..7fb4751 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -46,7 +46,7 @@ class AccessibilityViewsDelegate : public views::ViewsDelegate {
     return false;
   }
   virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type) {
+      views::View* view, ui::AccessibilityTypes::Event event_type) {
     AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
         view, event_type);
   }
diff --git a/chrome/browser/ui/views/accessible_pane_view.cc b/chrome/browser/ui/views/accessible_pane_view.cc
index c6789bc..9dfa4a2 100644
--- a/chrome/browser/ui/views/accessible_pane_view.cc
+++ b/chrome/browser/ui/views/accessible_pane_view.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/ui/views/accessible_pane_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_search.h"
@@ -192,8 +193,8 @@ void AccessiblePaneView::SetVisible(bool flag) {
   View::SetVisible(flag);
 }
 
-AccessibilityTypes::Role AccessiblePaneView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PANE;
+void AccessiblePaneView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PANE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/accessible_pane_view.h b/chrome/browser/ui/views/accessible_pane_view.h
index 349fc0d..8f7d56c 100644
--- a/chrome/browser/ui/views/accessible_pane_view.h
+++ b/chrome/browser/ui/views/accessible_pane_view.h
@@ -41,19 +41,20 @@ class AccessiblePaneView : public views::View,
   virtual bool SetPaneFocusAndFocusDefault(int view_storage_id);
 
   // Overridden from views::View:
-  virtual FocusTraversable* GetPaneFocusTraversable();
-  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
-  virtual void SetVisible(bool flag);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE;
+  virtual bool AcceleratorPressed(const views::Accelerator& accelerator)
+      OVERRIDE;
+  virtual void SetVisible(bool flag) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::FocusChangeListener:
   virtual void FocusWillChange(View* focused_before,
-                               View* focused_now);
+                               View* focused_now) OVERRIDE;
 
   // Overridden from views::FocusTraversable:
-  virtual views::FocusSearch* GetFocusSearch();
-  virtual FocusTraversable* GetFocusTraversableParent();
-  virtual View* GetFocusTraversableParentView();
+  virtual views::FocusSearch* GetFocusSearch() OVERRIDE;
+  virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE;
+  virtual View* GetFocusTraversableParentView() OVERRIDE;
 
  protected:
   // A subclass can override this to provide a default focusable child
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
index 78f19ab..28c3a31 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
@@ -86,8 +86,9 @@ void BookmarkBarInstructionsView::ViewHierarchyChanged(bool is_add,
     UpdateColors();
 }
 
-AccessibilityTypes::Role BookmarkBarInstructionsView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void BookmarkBarInstructionsView::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 void BookmarkBarInstructionsView::LinkActivated(views::Link* source,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
index 3b6bf13..675df4a 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
 #pragma once
 
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/link.h"
 #include "views/view.h"
 
@@ -35,16 +36,16 @@ class BookmarkBarInstructionsView : public views::View,
   explicit BookmarkBarInstructionsView(Delegate* delegate);
 
   // View overrides.
-  virtual gfx::Size GetPreferredSize();
-  virtual void Layout();
-  virtual void OnThemeChanged();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void OnThemeChanged() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+                                    views::View* child) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // LinkController.
-  virtual void LinkActivated(views::Link* source, int event_flags);
+  virtual void LinkActivated(views::Link* source, int event_flags) OVERRIDE;
 
  private:
   void UpdateColors();
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index c1cb88d89..d61b4ad 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -40,6 +40,7 @@
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -297,7 +298,7 @@ class BookmarkBarView::ButtonSeparatorView : public views::View {
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
 
-  virtual void OnPaint(gfx::Canvas* canvas) {
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     DetachableToolbarView::PaintVerticalDivider(
         canvas, kSeparatorStartX, height(), 1,
         DetachableToolbarView::kEdgeDividerColor,
@@ -305,14 +306,15 @@ class BookmarkBarView::ButtonSeparatorView : public views::View {
         GetThemeProvider()->GetColor(BrowserThemeProvider::COLOR_TOOLBAR));
   }
 
-  virtual gfx::Size GetPreferredSize() {
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
     // We get the full height of the bookmark bar, so that the height returned
     // here doesn't matter.
     return gfx::Size(kSeparatorWidth, 1);
   }
 
-  virtual AccessibilityTypes::Role GetAccessibleRole() {
-    return AccessibilityTypes::ROLE_SEPARATOR;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+    state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR);
+    state->role = ui::AccessibilityTypes::ROLE_SEPARATOR;
   }
 
  private:
@@ -675,12 +677,9 @@ void BookmarkBarView::ShowContextMenu(const gfx::Point& p,
   ShowContextMenu(this, p, is_mouse_gesture);
 }
 
-bool BookmarkBarView::IsAccessibleViewTraversable(views::View* view) {
-  return view != bookmarks_separator_view_ && view != instructions_;
-}
-
-AccessibilityTypes::Role BookmarkBarView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_TOOLBAR;
+void BookmarkBarView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS);
 }
 
 void BookmarkBarView::OnStateChanged() {
@@ -881,8 +880,6 @@ void BookmarkBarView::Init() {
   AddChildView(other_bookmarked_button_);
 
   bookmarks_separator_view_ = new ButtonSeparatorView();
-  bookmarks_separator_view_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR));
   AddChildView(bookmarks_separator_view_);
 
   instructions_ = new BookmarkBarInstructionsView(this);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 5737e7c..214893c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -109,34 +109,36 @@ class BookmarkBarView : public DetachableToolbarView,
     infobar_visible_ = infobar_visible;
   }
 
-  // DetachableToolbarView methods:
-  virtual bool IsDetached() const;
   virtual bool IsOnTop() const;
-  virtual double GetAnimationValue() const;
-  virtual int GetToolbarOverlap() const {
+
+  // DetachableToolbarView methods:
+  virtual bool IsDetached() const OVERRIDE;
+  virtual double GetAnimationValue() const OVERRIDE;
+  virtual int GetToolbarOverlap() const OVERRIDE {
     return GetToolbarOverlap(false);
   }
 
   // View methods:
-  virtual gfx::Size GetPreferredSize();
-  virtual gfx::Size GetMinimumSize();
-  virtual void Layout();
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
-  virtual void PaintChildren(gfx::Canvas* canvas);
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual gfx::Size GetMinimumSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
+      OVERRIDE;
+  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
   virtual bool GetDropFormats(
       int* formats,
-      std::set<ui::OSExchangeData::CustomFormat>* custom_formats);
-  virtual bool AreDropTypesRequired();
-  virtual bool CanDrop(const ui::OSExchangeData& data);
-  virtual void OnDragEntered(const views::DropTargetEvent& event);
-  virtual int OnDragUpdated(const views::DropTargetEvent& event);
-  virtual void OnDragExited();
-  virtual int OnPerformDrop(const views::DropTargetEvent& event);
-  virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture);
+      std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+  virtual bool AreDropTypesRequired() OVERRIDE;
+  virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
+  virtual void OnDragEntered(const views::DropTargetEvent& event) OVERRIDE;
+  virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void OnDragExited() OVERRIDE;
+  virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture)
+      OVERRIDE;
 
   // AccessiblePaneView methods:
-  virtual bool IsAccessibleViewTraversable(views::View* view);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // ProfileSyncServiceObserver method.
   virtual void OnStateChanged();
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 49ea7e2..9bb6721 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -18,6 +18,7 @@
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/tab_contents/page_navigator.h"
 #include "grit/generated_resources.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/button/menu_button.h"
@@ -84,7 +85,7 @@ class ViewsDelegateImpl : public views::ViewsDelegate {
   }
 
   virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type) {}
+      views::View* view, ui::AccessibilityTypes::Event event_type) {}
 
 #if defined(OS_WIN)
   virtual HICON GetDefaultWindowIcon() const { return 0; }
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 6870f65..d85548f 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -33,6 +33,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -170,7 +171,6 @@ void BrowserActionButton::UpdateState() {
   if (name.empty())
     name = UTF8ToUTF16(extension()->name());
   SetTooltipText(UTF16ToWideHack(name));
-  SetAccessibleName(name);
   parent()->SchedulePaint();
 }
 
@@ -292,8 +292,6 @@ BrowserActionView::BrowserActionView(const Extension* extension,
   button_->SetDragController(panel_);
   AddChildView(button_);
   button_->UpdateState();
-  SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS_BROWSER_ACTION));
 }
 
 BrowserActionView::~BrowserActionView() {
@@ -319,8 +317,10 @@ gfx::Canvas* BrowserActionView::GetIconWithBadge() {
   return canvas;
 }
 
-AccessibilityTypes::Role BrowserActionView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void BrowserActionView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(
+      IDS_ACCNAME_EXTENSIONS_BROWSER_ACTION);
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 void BrowserActionView::Layout() {
@@ -372,8 +372,6 @@ BrowserActionsContainer::BrowserActionsContainer(Browser* browser,
 
   resize_animation_.reset(new ui::SlideAnimation(this));
   resize_area_ = new views::ResizeArea(this);
-  resize_area_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR));
   AddChildView(resize_area_);
 
   chevron_ = new views::MenuButton(NULL, std::wstring(), this, false);
@@ -383,8 +381,6 @@ BrowserActionsContainer::BrowserActionsContainer(Browser* browser,
       l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS_CHEVRON));
   chevron_->SetVisible(false);
   AddChildView(chevron_);
-
-  SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS));
 }
 
 BrowserActionsContainer::~BrowserActionsContainer() {
@@ -741,8 +737,10 @@ void BrowserActionsContainer::OnThemeChanged() {
   LoadImages();
 }
 
-AccessibilityTypes::Role BrowserActionsContainer::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void BrowserActionsContainer::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS);
 }
 
 void BrowserActionsContainer::RunMenu(View* source, const gfx::Point& pt) {
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index 94c13139e..d803447 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -27,7 +27,6 @@
 #include "views/view.h"
 
 class Browser;
-class BrowserActionsContainer;
 class BrowserActionOverflowMenuController;
 class BrowserActionsContainer;
 class Extension;
@@ -163,7 +162,7 @@ class BrowserActionView : public views::View {
   gfx::Canvas* GetIconWithBadge();
 
   // Accessibility accessors, overridden from View.
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   virtual void Layout();
@@ -331,7 +330,7 @@ class BrowserActionsContainer
   virtual void OnDragExited();
   virtual int OnPerformDrop(const views::DropTargetEvent& event);
   virtual void OnThemeChanged();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::ViewMenuDelegate:
   virtual void RunMenu(View* source, const gfx::Point& pt);
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 3771682..ecd9e92 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -114,7 +114,7 @@ bool ChromeViewsDelegate::GetSavedMaximizedState(
 }
 
 void ChromeViewsDelegate::NotifyAccessibilityEvent(
-    views::View* view, AccessibilityTypes::Event event_type) {
+    views::View* view, ui::AccessibilityTypes::Event event_type) {
   AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
       view, event_type);
 }
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index c48f07b..952ae43 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "build/build_config.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "views/views_delegate.h"
 
 namespace views {
@@ -32,7 +33,7 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
                                       const std::wstring& window_name,
                                       bool* maximized) const;
   virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type);
+      views::View* view, ui::AccessibilityTypes::Event event_type);
 #if defined(OS_WIN)
   virtual HICON GetDefaultWindowIcon() const;
 #endif
diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc
index 1783b16..eaafa09 100644
--- a/chrome/browser/ui/views/download_item_view.cc
+++ b/chrome/browser/ui/views/download_item_view.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/ui/views/download_shelf_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -949,15 +950,13 @@ void DownloadItemView::ShowContextMenu(const gfx::Point& p,
   }
 }
 
-AccessibilityTypes::Role DownloadItemView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PUSHBUTTON;
-}
-
-AccessibilityTypes::State DownloadItemView::GetAccessibleState() {
+void DownloadItemView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = accessible_name_;
+  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   if (download_->safety_state() == DownloadItem::DANGEROUS) {
-    return AccessibilityTypes::STATE_UNAVAILABLE;
+    state->state = ui::AccessibilityTypes::STATE_UNAVAILABLE;
   } else {
-    return AccessibilityTypes::STATE_HASPOPUP;
+    state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
   }
 }
 
@@ -1079,9 +1078,6 @@ bool DownloadItemView::InDropDownButtonXCoordinateRange(int x) {
 }
 
 void DownloadItemView::UpdateAccessibleName() {
-  string16 current_name;
-  GetAccessibleName(&current_name);
-
   string16 new_name;
   if (download_->safety_state() == DownloadItem::DANGEROUS) {
     new_name = WideToUTF16Hack(dangerous_download_label_->GetText());
@@ -1090,12 +1086,13 @@ void DownloadItemView::UpdateAccessibleName() {
         download_->GetFileNameToReportUser().LossyDisplayName();
   }
 
-  // If the name has changed, call SetAccessibleName and notify
-  // assistive technology that the name has changed so they can
-  // announce it immediately.
-  if (new_name != current_name) {
-    SetAccessibleName(new_name);
-    if (GetWidget())
-      NotifyAccessibilityEvent(AccessibilityTypes::EVENT_NAME_CHANGED);
+  // If the name has changed, notify assistive technology that the name
+  // has changed so they can announce it immediately.
+  if (new_name != accessible_name_) {
+    accessible_name_ = new_name;
+    if (GetWidget()) {
+      GetWidget()->NotifyAccessibilityEvent(
+          this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
+    }
   }
 }
diff --git a/chrome/browser/ui/views/download_item_view.h b/chrome/browser/ui/views/download_item_view.h
index e8f427a..6994378 100644
--- a/chrome/browser/ui/views/download_item_view.h
+++ b/chrome/browser/ui/views/download_item_view.h
@@ -77,8 +77,7 @@ class DownloadItemView : public views::ButtonListener,
   virtual bool OnMouseDragged(const views::MouseEvent& event);
   virtual bool OnKeyPressed(const views::KeyEvent& e);
   virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
@@ -279,6 +278,9 @@ class DownloadItemView : public views::ButtonListener,
   // might delete us).
   bool* deleted_;
 
+  // The name of this view as reported to assistive technology.
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadItemView);
 };
 
diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc
index 0e6dd44..d204d62c 100644
--- a/chrome/browser/ui/views/first_run_search_engine_view.cc
+++ b/chrome/browser/ui/views/first_run_search_engine_view.cc
@@ -18,10 +18,11 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "grit/chromium_strings.h"
-#include "grit/google_chrome_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/google_chrome_strings.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -265,7 +266,8 @@ void FirstRunSearchEngineView::OnTemplateURLModelChanged() {
   // This will tell screenreaders that they should read the full text
   // of this dialog to the user now (rather than waiting for the user
   // to explore it).
-  NotifyAccessibilityEvent(AccessibilityTypes::EVENT_ALERT);
+  GetWidget()->NotifyAccessibilityEvent(
+      this, ui::AccessibilityTypes::EVENT_ALERT, true);
 }
 
 gfx::Size FirstRunSearchEngineView::GetPreferredSize() {
@@ -427,8 +429,9 @@ void FirstRunSearchEngineView::Layout() {
   }  // if (search_engine_choices.size() > 0)
 }
 
-AccessibilityTypes::Role FirstRunSearchEngineView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_ALERT;
+void FirstRunSearchEngineView::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }
 
 std::wstring FirstRunSearchEngineView::GetWindowTitle() const {
diff --git a/chrome/browser/ui/views/first_run_search_engine_view.h b/chrome/browser/ui/views/first_run_search_engine_view.h
index 5db011b..eee914c 100644
--- a/chrome/browser/ui/views/first_run_search_engine_view.h
+++ b/chrome/browser/ui/views/first_run_search_engine_view.h
@@ -88,29 +88,31 @@ class FirstRunSearchEngineView
 
   virtual ~FirstRunSearchEngineView();
 
+  bool IsAlwaysOnTop() const { return true; }
+  bool HasAlwaysOnTopMenu() const { return false; }
+
   // Overridden from views::View:
-  virtual gfx::Size GetPreferredSize();
-  virtual void Layout();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::WindowDelegate:
-  virtual std::wstring GetWindowTitle() const;
-  views::View* GetContentsView() { return this; }
-  bool CanResize() const { return false; }
-  bool CanMaximize() const { return false; }
-  bool IsAlwaysOnTop() const { return true; }
-  bool HasAlwaysOnTopMenu() const { return false; }
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
+  views::View* GetContentsView() OVERRIDE { return this; }
+  bool CanResize() const OVERRIDE{ return false; }
+  bool CanMaximize() const OVERRIDE { return false; }
 
   // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event)
+      OVERRIDE;
 
   // Override from View so we can draw the gray background at dialog top.
-  virtual void OnPaint(gfx::Canvas* canvas);
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // Overridden from TemplateURLModelObserver. When the search engines have
   // loaded from the profile, we can populate the logos in the dialog box
   // to present to the user.
-  virtual void OnTemplateURLModelChanged();
+  virtual void OnTemplateURLModelChanged() OVERRIDE;
 
  private:
   // Initializes the labels and controls in the view.
@@ -141,4 +143,3 @@ class FirstRunSearchEngineView
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_
-
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc
index 094e6c3..6476bc4 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.cc
+++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "grit/chromium_strings.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -22,9 +23,7 @@ BrowserRootView::BrowserRootView(BrowserView* browser_view,
                                  views::Widget* widget)
     : views::RootView(widget),
       browser_view_(browser_view),
-      forwarding_to_tab_strip_(false) {
-  SetAccessibleName(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-}
+      forwarding_to_tab_strip_(false) { }
 
 bool BrowserRootView::GetDropFormats(
       int* formats,
@@ -110,6 +109,11 @@ int BrowserRootView::OnPerformDrop(const views::DropTargetEvent& event) {
   return tabstrip()->OnPerformDrop(*mapped_event);
 }
 
+void BrowserRootView::GetAccessibleState(ui::AccessibleViewState* state) {
+  RootView::GetAccessibleState(state);
+  state->name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+}
+
 bool BrowserRootView::ShouldForwardToTabStrip(
     const views::DropTargetEvent& event) {
   if (!tabstrip()->IsVisible())
diff --git a/chrome/browser/ui/views/frame/browser_root_view.h b/chrome/browser/ui/views/frame/browser_root_view.h
index 1fcccb5..bba1c10 100644
--- a/chrome/browser/ui/views/frame/browser_root_view.h
+++ b/chrome/browser/ui/views/frame/browser_root_view.h
@@ -25,15 +25,17 @@ class BrowserRootView : public views::RootView {
   // You must call set_tabstrip before this class will accept drops.
   BrowserRootView(BrowserView* browser_view, views::Widget* widget);
 
+  // Overridden from views::View:
   virtual bool GetDropFormats(
       int* formats,
-      std::set<ui::OSExchangeData::CustomFormat>* custom_formats);
-  virtual bool AreDropTypesRequired();
-  virtual bool CanDrop(const ui::OSExchangeData& data);
-  virtual void OnDragEntered(const views::DropTargetEvent& event);
-  virtual int OnDragUpdated(const views::DropTargetEvent& event);
-  virtual void OnDragExited();
-  virtual int OnPerformDrop(const views::DropTargetEvent& event);
+      std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+  virtual bool AreDropTypesRequired() OVERRIDE;
+  virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
+  virtual void OnDragEntered(const views::DropTargetEvent& event) OVERRIDE;
+  virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void OnDragExited() OVERRIDE;
+  virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   // Returns true if the event should be forwarded to the tabstrip.
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index aba18fb..328b449 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -74,6 +74,7 @@
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "grit/webkit_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
@@ -1825,8 +1826,9 @@ void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
-AccessibilityTypes::Role BrowserView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_CLIENT;
+void BrowserView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
+  state->role = ui::AccessibilityTypes::ROLE_CLIENT;
 }
 
 void BrowserView::InfoBarContainerSizeChanged(bool is_animating) {
@@ -1855,8 +1857,6 @@ void BrowserView::InitTabStrip(TabStripModel* model) {
       new BrowserTabStripController(browser_.get(), model);
 
   tabstrip_ = CreateTabStrip(tabstrip_controller, UseVerticalTabs());
-
-  tabstrip_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_TABSTRIP));
   AddChildView(tabstrip_);
 
   tabstrip_controller->InitFromModel(tabstrip_);
@@ -1884,14 +1884,12 @@ void BrowserView::Init() {
   }
 
   LoadAccelerators();
-  SetAccessibleName(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
   InitTabStrip(browser_->tabstrip_model());
 
   toolbar_ = new ToolbarView(browser_.get());
   AddChildView(toolbar_);
   toolbar_->Init(browser_->profile());
-  toolbar_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLBAR));
 
   infobar_container_ = new InfoBarContainer(this);
   AddChildView(infobar_container_);
@@ -2022,8 +2020,6 @@ bool BrowserView::MaybeShowBookmarkBar(TabContentsWrapper* contents) {
       bookmark_bar_view_->SetProfile(contents->profile());
     }
     bookmark_bar_view_->SetPageNavigator(contents->tab_contents());
-    bookmark_bar_view_->SetAccessibleName(
-        l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS));
     new_bookmark_bar_view = bookmark_bar_view_.get();
   }
   return UpdateChildViewAndLayout(new_bookmark_bar_view, &active_bookmark_bar_);
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index fecd185..74a71b0 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -414,14 +414,14 @@ class BrowserView : public BrowserBubbleHost,
   }
 
   // Overridden from views::View:
-  virtual std::string GetClassName() const;
-  virtual void Layout();
-  virtual void PaintChildren(gfx::Canvas* canvas);
+  virtual std::string GetClassName() const OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
-  virtual void ChildPreferredSizeChanged(View* child);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+                                    views::View* child) OVERRIDE;
+  virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Factory Methods.
   // Returns a new LayoutManager for this browser view. A subclass may
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 3bdbd2c..c68c571 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -16,6 +16,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
@@ -400,8 +401,9 @@ bool OpaqueBrowserFrameView::HitTest(const gfx::Point& l) const {
   return browser_view_->IsPositionInWindowCaption(browser_view_point);
 }
 
-AccessibilityTypes::Role OpaqueBrowserFrameView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_TITLEBAR;
+void OpaqueBrowserFrameView::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_TITLEBAR;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index 0303d3a..a001b5d 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -45,28 +45,30 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   virtual gfx::Rect GetBoundsForReservedArea() const;
 
   // Overridden from views::NonClientFrameView:
-  virtual gfx::Rect GetBoundsForClientView() const;
-  virtual bool AlwaysUseNativeFrame() const;
-  virtual bool AlwaysUseCustomFrame() const;
+  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
+  virtual bool AlwaysUseNativeFrame() const OVERRIDE;
+  virtual bool AlwaysUseCustomFrame() const OVERRIDE;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const;
-  virtual int NonClientHitTest(const gfx::Point& point);
-  virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask);
-  virtual void EnableClose(bool enable);
-  virtual void ResetWindowControls();
+      const gfx::Rect& client_bounds) const OVERRIDE;
+  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
+  virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
+      OVERRIDE;
+  virtual void EnableClose(bool enable) OVERRIDE;
+  virtual void ResetWindowControls() OVERRIDE;
 
   // Overridden from views::View:
-  virtual void OnPaint(gfx::Canvas* canvas);
-  virtual void Layout();
-  virtual bool HitTest(const gfx::Point& l) const;
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event)
+      OVERRIDE;
 
   // Overridden from TabIconView::TabIconViewModel:
-  virtual bool ShouldTabIconViewAnimate() const;
-  virtual SkBitmap GetFavIconForTabIconView();
+  virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
+  virtual SkBitmap GetFavIconForTabIconView() OVERRIDE;
 
  private:
   // Returns the thickness of the border that makes up the window frame edges.
diff --git a/chrome/browser/ui/views/infobars/infobar_container.cc b/chrome/browser/ui/views/infobars/infobar_container.cc
index 20761aa..d8a1c72 100644
--- a/chrome/browser/ui/views/infobars/infobar_container.cc
+++ b/chrome/browser/ui/views/infobars/infobar_container.cc
@@ -12,6 +12,7 @@
 #include "chrome/common/notification_source.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 
 InfoBarContainer::Delegate::~Delegate() {
@@ -21,7 +22,6 @@ InfoBarContainer::InfoBarContainer(Delegate* delegate)
     : delegate_(delegate),
       tab_contents_(NULL) {
   SetID(VIEW_ID_INFO_BAR_CONTAINER);
-  SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER));
 }
 
 InfoBarContainer::~InfoBarContainer() {
@@ -109,8 +109,9 @@ void InfoBarContainer::Layout() {
   }
 }
 
-AccessibilityTypes::Role InfoBarContainer::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void InfoBarContainer::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER);
 }
 
 void InfoBarContainer::Observe(NotificationType type,
diff --git a/chrome/browser/ui/views/infobars/infobar_container.h b/chrome/browser/ui/views/infobars/infobar_container.h
index 4dba347..0715192 100644
--- a/chrome/browser/ui/views/infobars/infobar_container.h
+++ b/chrome/browser/ui/views/infobars/infobar_container.h
@@ -68,14 +68,14 @@ class InfoBarContainer : public AccessiblePaneView,
   typedef std::set<InfoBarView*> InfoBars;
 
   // AccessiblePaneView:
-  virtual gfx::Size GetPreferredSize();
-  virtual void Layout();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Removes an InfoBar for the specified delegate, in response to a
   // notification from the selected TabContents. The InfoBar's disappearance
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index c973d2a..97689bf 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -13,6 +13,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -54,9 +55,6 @@ InfoBarView::InfoBarView(InfoBarDelegate* delegate)
 
   InfoBarDelegate::Type infobar_type = delegate->GetInfoBarType();
   set_background(new InfoBarBackground(infobar_type));
-  SetAccessibleName(l10n_util::GetStringUTF16(
-      (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
-      IDS_ACCNAME_INFOBAR_WARNING : IDS_ACCNAME_INFOBAR_PAGE_ACTION));
 
   animation_->SetTweenType(ui::Tween::LINEAR);
 }
@@ -273,7 +271,8 @@ void InfoBarView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
 #endif
       if (GetFocusManager())
         GetFocusManager()->AddFocusChangeListener(this);
-      NotifyAccessibilityEvent(AccessibilityTypes::EVENT_ALERT);
+      GetWidget()->NotifyAccessibilityEvent(
+          this, ui::AccessibilityTypes::EVENT_ALERT, true);
 
       if (close_button_ == NULL) {
         SkBitmap* image = delegate_->GetIcon();
@@ -364,8 +363,11 @@ int InfoBarView::OffsetY(const gfx::Size prefsize) const {
   return CenterY(prefsize) - (target_height_ - height());
 }
 
-AccessibilityTypes::Role InfoBarView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_ALERT;
+void InfoBarView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(
+      (delegate_->GetInfoBarType() == InfoBarDelegate::WARNING_TYPE) ?
+      IDS_ACCNAME_INFOBAR_WARNING : IDS_ACCNAME_INFOBAR_PAGE_ACTION);
+  state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }
 
 gfx::Size InfoBarView::GetPreferredSize() {
@@ -377,8 +379,10 @@ void InfoBarView::FocusWillChange(View* focused_before, View* focused_now) {
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !this->Contains(focused_before) &&
-      this->Contains(focused_now))
-    NotifyAccessibilityEvent(AccessibilityTypes::EVENT_ALERT);
+      this->Contains(focused_now)) {
+    GetWidget()->NotifyAccessibilityEvent(
+        this, ui::AccessibilityTypes::EVENT_ALERT, true);
+  }
 }
 
 void InfoBarView::AnimationEnded(const ui::Animation* animation) {
diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h
index fe3655b..dbe847f 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.h
+++ b/chrome/browser/ui/views/infobars/infobar_view.h
@@ -106,14 +106,16 @@ class InfoBarView : public InfoBar,
                                              bool needs_elevation);
 
   // views::View:
-  virtual void Layout();
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual void Layout() OVERRIDE;
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
+      OVERRIDE;
 
   // views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event)
+      OVERRIDE;
 
   // ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation);
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Returns the minimum width the content (that is, everything between the icon
   // and the close button) can be shrunk to.  This is used to prevent the close
@@ -147,14 +149,15 @@ class InfoBarView : public InfoBar,
   static const int kHorizontalPadding;
 
   // views::View:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual gfx::Size GetPreferredSize();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // views::FocusChangeListener:
-  virtual void FocusWillChange(View* focused_before, View* focused_now);
+  virtual void FocusWillChange(View* focused_before, View* focused_now)
+      OVERRIDE;
 
   // ui::AnimationDelegate:
-  virtual void AnimationEnded(const ui::Animation* animation);
+  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
 
   // Destroys the external focus tracker, if present. If |restore_focus| is
   // true, restores focus to the view tracked by the focus tracker before doing
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 686c6f7..6afd564 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -37,6 +37,7 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -172,8 +173,6 @@ void LocationBarView::Init() {
 
   location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->SetID(VIEW_ID_AUTOCOMPLETE);
-  location_entry_view_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION));
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
@@ -205,8 +204,6 @@ void LocationBarView::Init() {
     star_view_->SetVisible(true);
   }
 
-  SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION));
-
   // Initialize the location entry. We do this to avoid a black flash which is
   // visible when the location entry has just been initialized.
   Update(NULL);
@@ -1055,8 +1052,9 @@ bool LocationBarView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
 #endif
 }
 
-AccessibilityTypes::Role LocationBarView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void LocationBarView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
 }
 
 void LocationBarView::WriteDragData(views::View* sender,
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 90607c8..2226c3a 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -208,7 +208,7 @@ class LocationBarView : public LocationBar,
   // Overridden from views::View:
   virtual std::string GetClassName() const OVERRIDE;
   virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::DragController:
   virtual void WriteDragData(View* sender,
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 1e7ca9a..1127067 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -8,12 +8,13 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/menu/menu_2.h"
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
@@ -101,8 +102,8 @@ void PageActionImageView::ExecuteAction(int button,
   }
 }
 
-AccessibilityTypes::Role PageActionImageView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PUSHBUTTON;
+void PageActionImageView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
 }
 
 bool PageActionImageView::OnMousePressed(const views::MouseEvent& event) {
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h
index ed0f190..47c39fd 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -41,21 +41,23 @@ class PageActionImageView : public views::ImageView,
   }
 
   // Overridden from view.
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
-  virtual bool OnKeyPressed(const views::KeyEvent& e);
-  virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture);
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled)
+      OVERRIDE;
+  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
+  virtual void ShowContextMenu(const gfx::Point& p, bool is_mouse_gesture)
+      OVERRIDE;
 
   // Overridden from ImageLoadingTracker.
   virtual void OnImageLoaded(
-      SkBitmap* image, ExtensionResource resource, int index);
+      SkBitmap* image, ExtensionResource resource, int index) OVERRIDE;
 
   // Overridden from ExtensionContextMenuModelModel::Delegate
-  virtual void InspectPopup(ExtensionAction* action);
+  virtual void InspectPopup(ExtensionAction* action) OVERRIDE;
 
   // Overridden from ExtensionPopup::Observer
-  virtual void ExtensionPopupIsClosing(ExtensionPopup* popup);
+  virtual void ExtensionPopupIsClosing(ExtensionPopup* popup) OVERRIDE;
 
   // Called to notify the PageAction that it should determine whether to be
   // visible or hidden. |contents| is the TabContents that is active, |url| is
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
index 75cc136..fd6d717 100644
--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/common/extensions/extension.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 
 PageActionWithBadgeView::PageActionWithBadgeView(
     PageActionImageView* image_view) {
@@ -13,8 +14,9 @@ PageActionWithBadgeView::PageActionWithBadgeView(
   AddChildView(image_view_);
 }
 
-AccessibilityTypes::Role PageActionWithBadgeView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void PageActionWithBadgeView::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 gfx::Size PageActionWithBadgeView::GetPreferredSize() {
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
index 6071bad..06f145d 100644
--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
@@ -20,8 +20,9 @@ class PageActionWithBadgeView : public views::View {
 
   PageActionImageView* image_view() { return image_view_; }
 
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual gfx::Size GetPreferredSize();
+  // View overrides:
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   void UpdateVisibility(TabContents* contents, const GURL& url);
 
diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc
index 886aec2..2e49fc7 100644
--- a/chrome/browser/ui/views/location_bar/star_view.cc
+++ b/chrome/browser/ui/views/location_bar/star_view.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -27,16 +28,13 @@ StarView::~StarView() {
 void StarView::SetToggled(bool on) {
   SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
       on ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR)));
-  // Since StarView is an ImageView, the SetTooltipText changes the accessible
-  // name. To keep the accessible name unchanged, we need to set the accessible
-  // name right after we modify the tooltip text for this view.
-  SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_STAR));
   SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
       on ? IDR_STAR_LIT : IDR_STAR));
 }
 
-AccessibilityTypes::Role StarView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PUSHBUTTON;
+void StarView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_STAR);
+  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
 }
 
 bool StarView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
diff --git a/chrome/browser/ui/views/location_bar/star_view.h b/chrome/browser/ui/views/location_bar/star_view.h
index ad02f9e..f27f3f0 100644
--- a/chrome/browser/ui/views/location_bar/star_view.h
+++ b/chrome/browser/ui/views/location_bar/star_view.h
@@ -27,17 +27,19 @@ class StarView : public views::ImageView, public InfoBubbleDelegate {
 
  private:
   // views::ImageView overrides:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
-  virtual bool OnKeyPressed(const views::KeyEvent& e);
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
+      OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled)
+      OVERRIDE;
+  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
 
   // InfoBubbleDelegate overrides:
   virtual void InfoBubbleClosing(InfoBubble* info_bubble,
-                                 bool closed_by_escape);
-  virtual bool CloseOnEscape();
-  virtual bool FadeInOnShow() { return false; }
+                                 bool closed_by_escape) OVERRIDE;
+  virtual bool CloseOnEscape() OVERRIDE;
+  virtual bool FadeInOnShow() OVERRIDE { return false; }
 
   // The CommandUpdater for the Browser object that owns the location bar.
   CommandUpdater* command_updater_;
diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc
index 0996b4a..621ffae 100644
--- a/chrome/browser/ui/views/options/general_page_view.cc
+++ b/chrome/browser/ui/views/options/general_page_view.cc
@@ -35,6 +35,7 @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "views/controls/button/radio_button.h"
@@ -66,8 +67,8 @@ class OptionsGroupContents : public views::View {
   OptionsGroupContents() { }
 
   // views::View overrides:
-  virtual AccessibilityTypes::Role GetAccessibleRole() {
-    return AccessibilityTypes::ROLE_GROUPING;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+    state->state = ui::AccessibilityTypes::ROLE_GROUPING;
   }
 
  private:
diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc
index f4a9670..7a7d741 100644
--- a/chrome/browser/ui/views/options/options_group_view.cc
+++ b/chrome/browser/ui/views/options/options_group_view.cc
@@ -9,8 +9,9 @@
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -50,9 +51,6 @@ OptionsGroupView::OptionsGroupView(views::View* contents,
 
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-
-  SetAccessibleName(WideToUTF16Hack(title));
-  contents->SetAccessibleName(WideToUTF16Hack(title));
 }
 
 OptionsGroupView::~OptionsGroupView() {
@@ -70,8 +68,9 @@ int OptionsGroupView::GetContentsWidth() const {
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsGroupView, views::View overrides:
 
-AccessibilityTypes::Role OptionsGroupView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void OptionsGroupView::GetAccessibleState(ui::AccessibleViewState* state) {
+  title_label_->GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 void OptionsGroupView::OnPaint(gfx::Canvas* canvas) {
diff --git a/chrome/browser/ui/views/options/options_group_view.h b/chrome/browser/ui/views/options/options_group_view.h
index 1d32c0a..2add3c4 100644
--- a/chrome/browser/ui/views/options/options_group_view.h
+++ b/chrome/browser/ui/views/options/options_group_view.h
@@ -35,11 +35,11 @@ class OptionsGroupView : public views::View {
 
  protected:
   // views::View overrides:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual void OnPaint(gfx::Canvas* canvas);
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
 
  private:
   void Init();
diff --git a/chrome/browser/ui/views/options/options_page_view.cc b/chrome/browser/ui/views/options/options_page_view.cc
index b81b3af..3cbf3a5 100644
--- a/chrome/browser/ui/views/options/options_page_view.cc
+++ b/chrome/browser/ui/views/options/options_page_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/options/options_page_view.h"
 
 #include "chrome/browser/metrics/user_metrics.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/widget.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,6 +34,6 @@ void OptionsPageView::ViewHierarchyChanged(bool is_add,
   }
 }
 
-AccessibilityTypes::Role OptionsPageView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PAGETAB;
+void OptionsPageView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PAGETAB;
 }
diff --git a/chrome/browser/ui/views/options/options_page_view.h b/chrome/browser/ui/views/options/options_page_view.h
index bbbc8c4..de438a1 100644
--- a/chrome/browser/ui/views/options/options_page_view.h
+++ b/chrome/browser/ui/views/options/options_page_view.h
@@ -39,8 +39,8 @@ class OptionsPageView : public views::View,
   // views::View overrides:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+                                    views::View* child) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   // Whether or not the control layout has been initialized for this page.
diff --git a/chrome/browser/ui/views/options/options_window_view.cc b/chrome/browser/ui/views/options/options_window_view.cc
index 7126f7d..91d4290 100644
--- a/chrome/browser/ui/views/options/options_window_view.cc
+++ b/chrome/browser/ui/views/options/options_window_view.cc
@@ -17,6 +17,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/widget/root_view.h"
@@ -39,29 +40,29 @@ class OptionsWindowView : public views::View,
   void ShowOptionsPage(OptionsPage page, OptionsGroup highlight_group);
 
   // views::DialogDelegate implementation:
-  virtual int GetDialogButtons() const {
+  virtual int GetDialogButtons() const OVERRIDE {
     return MessageBoxFlags::DIALOGBUTTON_CANCEL;
   }
-  virtual std::wstring GetWindowTitle() const;
-  virtual std::wstring GetWindowName() const;
-  virtual void WindowClosing();
-  virtual bool Cancel();
-  virtual views::View* GetContentsView();
-  virtual bool ShouldRestoreWindowSize() const;
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
+  virtual std::wstring GetWindowName() const OVERRIDE;
+  virtual void WindowClosing() OVERRIDE;
+  virtual bool Cancel() OVERRIDE;
+  virtual views::View* GetContentsView() OVERRIDE;
+  virtual bool ShouldRestoreWindowSize() const OVERRIDE;
 
   // views::TabbedPane::Listener implementation:
-  virtual void TabSelectedAt(int index);
+  virtual void TabSelectedAt(int index) OVERRIDE;
 
   // views::View overrides:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  protected:
   // views::View overrides:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
  private:
   // Init the assorted Tabbed pages
   void Init();
@@ -166,8 +167,8 @@ void OptionsWindowView::TabSelectedAt(int index) {
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView, views::View overrides:
 
-AccessibilityTypes::Role OptionsWindowView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_CLIENT;
+void OptionsWindowView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_CLIENT;
 }
 
 void OptionsWindowView::Layout() {
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
index f99517c..6ac2a5b8 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc
@@ -9,6 +9,7 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/focus/focus_manager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -130,8 +131,9 @@ void NativeTabContentsContainerGtk::AboutToRequestFocusFromTabTraversal(
   container_->tab_contents()->FocusThroughTabTraversal(reverse);
 }
 
-AccessibilityTypes::Role NativeTabContentsContainerGtk::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void NativeTabContentsContainerGtk::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h
index 004b689..469f11e 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h
@@ -33,7 +33,7 @@ class NativeTabContentsContainerGtk : public NativeTabContentsContainer,
   virtual void OnFocus() OVERRIDE;
   virtual void RequestFocus() OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   TabContentsContainer* container_;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc
index e4dfd02..f0f7c9d 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc
@@ -10,7 +10,7 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
-
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/focus/focus_manager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -129,8 +129,9 @@ void NativeTabContentsContainerWin::AboutToRequestFocusFromTabTraversal(
   container_->tab_contents()->FocusThroughTabTraversal(reverse);
 }
 
-AccessibilityTypes::Role NativeTabContentsContainerWin::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void NativeTabContentsContainerWin::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h
index 1cfb5b5..4d60be22 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h
@@ -30,7 +30,7 @@ class NativeTabContentsContainerWin : public NativeTabContentsContainer,
   virtual void OnFocus() OVERRIDE;
   virtual void RequestFocus() OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   TabContentsContainer* container_;
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc
index 9de15da..7170163 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc
@@ -12,6 +12,7 @@
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -43,8 +44,8 @@ void TabContentsContainer::Observe(NotificationType type,
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, View overrides:
 
-AccessibilityTypes::Role TabContentsContainer::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_WINDOW;
+void TabContentsContainer::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
index a845464..94ab8bb 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container_native.h
@@ -44,16 +44,16 @@ class TabContentsContainer : public views::View,
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Overridden from views::View:
-  virtual void Layout();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void Layout() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   // Overridden from views::View:
   virtual void ViewHierarchyChanged(bool is_add, views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
 
  private:
   // Add or remove observers for events that we care about.
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
index d5a79aa..7330f30 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
@@ -43,9 +43,9 @@ class TabContentsContainer : public views::View,
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   // Add or remove observers for events that we care about.
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index 9c99e47..e4a2643 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -9,14 +9,15 @@
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -212,9 +213,6 @@ void BaseTab::SetData(const TabRendererData& data) {
     ResetCrashedFavIcon();
   }
 
-  // Sets the accessible name for the tab.
-  SetAccessibleName(data_.title);
-
   DataChanged(old);
 
   Layout();
@@ -348,11 +346,12 @@ bool BaseTab::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   return false;
 }
 
-AccessibilityTypes::Role BaseTab::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PAGETAB;
+void BaseTab::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PAGETAB;
+  state->name = data_.title;
 }
 
-ui::ThemeProvider* BaseTab::GetThemeProvider() {
+ui::ThemeProvider* BaseTab::GetThemeProvider() const {
   ui::ThemeProvider* tp = View::GetThemeProvider();
   return tp ? tp : theme_provider_;
 }
diff --git a/chrome/browser/ui/views/tabs/base_tab.h b/chrome/browser/ui/views/tabs/base_tab.h
index 8a43f06..75d34fc 100644
--- a/chrome/browser/ui/views/tabs/base_tab.h
+++ b/chrome/browser/ui/views/tabs/base_tab.h
@@ -83,15 +83,16 @@ class BaseTab : public ui::AnimationDelegate,
   bool IsCloseable() const;
 
   // views::View overrides:
-  virtual void OnMouseEntered(const views::MouseEvent& event);
-  virtual void OnMouseExited(const views::MouseEvent& event);
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual bool OnMouseDragged(const views::MouseEvent& event);
+  virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event,
-                               bool canceled);
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual ThemeProvider* GetThemeProvider();
+                               bool canceled) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
+      OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual ThemeProvider* GetThemeProvider() const OVERRIDE;
 
  protected:
   // Invoked from SetData after |data_| has been updated to the new data.
@@ -119,18 +120,18 @@ class BaseTab : public ui::AnimationDelegate,
   void PaintTitle(gfx::Canvas* canvas, SkColor title_color);
 
   // Overridden from AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation);
-  virtual void AnimationCanceled(const ui::Animation* animation);
-  virtual void AnimationEnded(const ui::Animation* animation);
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
 
   // views::ButtonListener overrides:
   virtual void ButtonPressed(views::Button* sender,
-                             const views::Event& event);
+                             const views::Event& event) OVERRIDE;
 
   // views::ContextMenuController overrides:
   virtual void ShowContextMenu(views::View* source,
                                const gfx::Point& p,
-                               bool is_mouse_gesture);
+                               bool is_mouse_gesture) OVERRIDE;
 
   // Returns the bounds of the title and icon.
   virtual const gfx::Rect& GetTitleBounds() const = 0;
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 059c7e5..e316db6 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -363,8 +364,9 @@ int TabStrip::OnPerformDrop(const DropTargetEvent& event) {
   return GetDropEffect(event);
 }
 
-AccessibilityTypes::Role TabStrip::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PAGETABLIST;
+void TabStrip::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_TABSTRIP);
+  state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
 }
 
 views::View* TabStrip::GetEventHandlerForPoint(const gfx::Point& point) {
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
index 7f0a339..45cdf45 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.h
+++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -56,29 +56,30 @@ class TabStrip : public BaseTabStrip,
   virtual void MouseMovedOutOfView();
 
   // BaseTabStrip implementation:
-  virtual void SetBackgroundOffset(const gfx::Point& offset);
-  virtual bool IsPositionInWindowCaption(const gfx::Point& point);
-  virtual void PrepareForCloseAt(int model_index);
-  virtual void RemoveTabAt(int model_index);
-  virtual void SelectTabAt(int old_model_index, int new_model_index);
-  virtual void TabTitleChangedNotLoading(int model_index);
-  virtual void StartHighlight(int model_index);
-  virtual void StopAllHighlighting();
-  virtual BaseTab* CreateTabForDragging();
+  virtual void SetBackgroundOffset(const gfx::Point& offset) OVERRIDE;
+  virtual bool IsPositionInWindowCaption(const gfx::Point& point) OVERRIDE;
+  virtual void PrepareForCloseAt(int model_index) OVERRIDE;
+  virtual void RemoveTabAt(int model_index) OVERRIDE;
+  virtual void SelectTabAt(int old_model_index, int new_model_index) OVERRIDE;
+  virtual void TabTitleChangedNotLoading(int model_index) OVERRIDE;
+  virtual void StartHighlight(int model_index) OVERRIDE;
+  virtual void StopAllHighlighting() OVERRIDE;
+  virtual BaseTab* CreateTabForDragging() OVERRIDE;
 
   // views::View overrides:
-  virtual void PaintChildren(gfx::Canvas* canvas);
-  virtual const views::View* GetViewByID(int id) const;
-  virtual gfx::Size GetPreferredSize();
+  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual const views::View* GetViewByID(int id) const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
   // NOTE: the drag and drop methods are invoked from FrameView. This is done to
   // allow for a drop region that extends outside the bounds of the TabStrip.
-  virtual void OnDragEntered(const views::DropTargetEvent& event);
-  virtual int OnDragUpdated(const views::DropTargetEvent& event);
-  virtual void OnDragExited();
-  virtual int OnPerformDrop(const views::DropTargetEvent& event);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual views::View* GetEventHandlerForPoint(const gfx::Point& point);
-  virtual void OnThemeChanged();
+  virtual void OnDragEntered(const views::DropTargetEvent& event) OVERRIDE;
+  virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void OnDragExited() OVERRIDE;
+  virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual views::View* GetEventHandlerForPoint(const gfx::Point& point)
+      OVERRIDE;
+  virtual void OnThemeChanged() OVERRIDE;
 
  protected:
   // BaseTabStrip overrides:
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 1eb475a..cff8fe1 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -25,6 +25,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -306,8 +307,9 @@ bool ToolbarView::SetPaneFocus(
   return true;
 }
 
-AccessibilityTypes::Role ToolbarView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_TOOLBAR;
+void ToolbarView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
+  state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLBAR);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index 1aa143c..42d803a 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -78,6 +78,8 @@ class ToolbarView : public AccessiblePaneView,
   // Remove a menu listener.
   void RemoveMenuListener(views::MenuListener* listener);
 
+  virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel);
+
   // Accessors...
   Browser* browser() const { return browser_; }
   BrowserActionsContainer* browser_actions() const { return browser_actions_; }
@@ -86,46 +88,44 @@ class ToolbarView : public AccessiblePaneView,
   views::MenuButton* app_menu() const { return app_menu_; }
 
   // Overridden from AccessiblePaneView
-  virtual bool SetPaneFocus(int view_storage_id, View* initial_focus);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-
-  // Overridden from Menu::Delegate:
-  virtual bool GetAcceleratorInfo(int id, ui::Accelerator* accel);
+  virtual bool SetPaneFocus(int view_storage_id, View* initial_focus) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::MenuDelegate:
-  virtual void RunMenu(views::View* source, const gfx::Point& pt);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
   // Overridden from LocationBarView::Delegate:
-  virtual TabContentsWrapper* GetTabContentsWrapper();
-  virtual InstantController* GetInstant();
-  virtual void OnInputInProgress(bool in_progress);
+  virtual TabContentsWrapper* GetTabContentsWrapper() OVERRIDE;
+  virtual InstantController* GetInstant() OVERRIDE;
+  virtual void OnInputInProgress(bool in_progress) OVERRIDE;
 
   // Overridden from CommandUpdater::CommandObserver:
-  virtual void EnabledStateChangedForCommand(int id, bool enabled);
+  virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
 
   // Overridden from views::BaseButton::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event)
+      OVERRIDE;
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Overridden from ui::AcceleratorProvider:
-  virtual bool GetAcceleratorForCommandId(int command_id,
-                                          ui::Accelerator* accelerator);
+  virtual bool GetAcceleratorForCommandId(
+      int command_id, ui::Accelerator* accelerator) OVERRIDE;
 
   // Overridden from views::View:
-  virtual gfx::Size GetPreferredSize();
-  virtual void Layout();
-  virtual void OnPaint(gfx::Canvas* canvas);
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual bool GetDropFormats(
       int* formats,
-      std::set<OSExchangeData::CustomFormat>* custom_formats);
-  virtual bool CanDrop(const ui::OSExchangeData& data);
-  virtual int OnDragUpdated(const views::DropTargetEvent& event);
-  virtual int OnPerformDrop(const views::DropTargetEvent& event);
-  virtual void OnThemeChanged();
+      std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+  virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
+  virtual int OnDragUpdated(const views::DropTargetEvent& event) OVERRIDE;
+  virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
+  virtual void OnThemeChanged() OVERRIDE;
 
   // The apparent horizontal space between most items, and the vertical padding
   // above and below them.
@@ -137,8 +137,8 @@ class ToolbarView : public AccessiblePaneView,
  protected:
 
   // Overridden from AccessiblePaneView
-  virtual views::View* GetDefaultFocusableChild();
-  virtual void RemovePaneFocus();
+  virtual views::View* GetDefaultFocusableChild() OVERRIDE;
+  virtual void RemovePaneFocus() OVERRIDE;
 
  private:
   // Returns true if we should show the upgrade recommended dot.
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index 2720aca..f983fb9 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -570,7 +570,6 @@ WrenchMenu::WrenchMenu(Browser* browser)
 void WrenchMenu::Init(ui::MenuModel* model) {
   DCHECK(!root_.get());
   root_.reset(new MenuItemView(this));
-  root_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP));
   root_->set_has_icons(true);  // We have checks, radios and icons, set this
                                // so we get the taller menu style.
   int next_id = 1;
diff --git a/views/accessibility/accessibility_types.h b/ui/base/accessibility/accessibility_types.h
index e55996e..62f3255 100644
--- a/views/accessibility/accessibility_types.h
+++ b/ui/base/accessibility/accessibility_types.h
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_
-#define VIEWS_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_
+#ifndef UI_BASE_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_
+#define UI_BASE_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_
 #pragma once
 
 #include "base/basictypes.h"
 
+namespace ui {
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // AccessibilityTypes
 //
-// Provides enumerations used to preserve platform-independence in accessibility
-// functions used in various Views, both in Browser\Views and Views.
+// Provides enumerations used to preserve platform-independence in
+// accessibility functions.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class AccessibilityTypes {
@@ -101,4 +103,6 @@ class AccessibilityTypes {
   ~AccessibilityTypes() {}
 };
 
-#endif  // VIEWS_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_
+}  // namespace ui
+
+#endif  // UI_BASE_ACCESSIBILITY_ACCESSIBILITY_TYPES_H_
diff --git a/ui/base/accessibility/accessible_view_state.h b/ui/base/accessibility/accessible_view_state.h
new file mode 100644
index 0000000..2f36a4b
--- /dev/null
+++ b/ui/base/accessibility/accessible_view_state.h
@@ -0,0 +1,66 @@
+// Copyright (c) 2011 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 UI_BASE_ACCESSIBILITY_ACCESSIBLE_VIEW_STATE_H_
+#define UI_BASE_ACCESSIBILITY_ACCESSIBLE_VIEW_STATE_H_
+#pragma once
+
+#include "base/basictypes.h"
+#include "base/string16.h"
+#include "ui/base/accessibility/accessibility_types.h"
+
+namespace ui {
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// AccessibleViewState
+//
+//   A cross-platform struct for storing the core accessibility information
+//   that should be provided about any UI view to assistive technology (AT).
+//
+////////////////////////////////////////////////////////////////////////////////
+struct AccessibleViewState {
+ public:
+  AccessibleViewState()
+      : role(AccessibilityTypes::ROLE_CLIENT),
+        state(0),
+        selection_start(-1),
+        selection_end(-1),
+        index(-1),
+        count(-1) { }
+
+  // The view's role, like button or list box.
+  AccessibilityTypes::Role role;
+
+  // The view's state, a bitmask containing fields such as checked
+  // (for a checkbox) and protected (for a password text box).
+  AccessibilityTypes::State state;
+
+  // The view's name / label.
+  string16 name;
+
+  // The view's value, for example the text content.
+  string16 value;
+
+  // The name of the default action if the user clicks on this view.
+  string16 default_action;
+
+  // The keyboard shortcut to activate this view, if any.
+  string16 keyboard_shortcut;
+
+  // The selection start and end. Only applies to views with text content,
+  // such as a text box or combo box; start and end should be -1 otherwise.
+  int selection_start;
+  int selection_end;
+
+  // The selected item's index and the count of the number of items.
+  // Only applies to views with multiple choices like a listbox; both
+  // index and count should be -1 otherwise.
+  int index;
+  int count;
+};
+
+}  // namespace ui
+
+#endif  // UI_BASE_ACCESSIBILITY_ACCESSIBLE_VIEW_STATE_H_
diff --git a/ui/base/ui_base.gypi b/ui/base/ui_base.gypi
index 72bf8c1..cd66942 100644
--- a/ui/base/ui_base.gypi
+++ b/ui/base/ui_base.gypi
@@ -57,6 +57,8 @@
         '../third_party/icu/icu.gyp:icuuc',
       ],
       'sources': [
+        'accessibility/accessibility_types.h',
+        'accessibility/accessible_view_state.h',
         'animation/animation.cc',
         'animation/animation.h',
         'animation/animation_container.cc',
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/native_view_accessibility_win.cc
index ae9f889..07a459e 100644
--- a/views/accessibility/view_accessibility.cc
+++ b/views/accessibility/native_view_accessibility_win.cc
@@ -1,28 +1,36 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/view_prop.h"
 #include "views/controls/button/native_button.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_win.h"
 
+using ui::AccessibilityTypes;
+
+namespace views {
+
 const char kViewsNativeHostPropForAccessibility[] =
     "Views_NativeViewHostHWNDForAccessibility";
 
 // static
-scoped_refptr<ViewAccessibility> ViewAccessibility::Create(views::View* view) {
-  CComObject<ViewAccessibility>* instance = NULL;
-  HRESULT hr = CComObject<ViewAccessibility>::CreateInstance(&instance);
+scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create(
+    views::View* view) {
+  CComObject<NativeViewAccessibilityWin>* instance = NULL;
+  HRESULT hr = CComObject<NativeViewAccessibilityWin>::CreateInstance(
+      &instance);
   DCHECK(SUCCEEDED(hr));
   instance->set_view(view);
-  return scoped_refptr<ViewAccessibility>(instance);
+  return scoped_refptr<NativeViewAccessibilityWin>(instance);
 }
 
 // static
-IAccessible* ViewAccessibility::GetAccessibleForView(views::View* view) {
+IAccessible* NativeViewAccessibilityWin::GetAccessibleForView(
+    views::View* view) {
   IAccessible* accessible = NULL;
 
   // First, check to see if the view is a native view.
@@ -43,18 +51,18 @@ IAccessible* ViewAccessibility::GetAccessibleForView(views::View* view) {
     }
   }
 
-  // Finally, use our ViewAccessibility implementation.
-  return view->GetViewAccessibility();
+  // Finally, use our NativeViewAccessibilityWin implementation.
+  return view->GetNativeViewAccessibilityWin();
 }
 
-ViewAccessibility::ViewAccessibility() : view_(NULL) {
+NativeViewAccessibilityWin::NativeViewAccessibilityWin() : view_(NULL) {
 }
 
-ViewAccessibility::~ViewAccessibility() {
+NativeViewAccessibilityWin::~NativeViewAccessibilityWin() {
 }
 
 // TODO(ctguil): Handle case where child View is not contained by parent.
-STDMETHODIMP ViewAccessibility::accHitTest(
+STDMETHODIMP NativeViewAccessibilityWin::accHitTest(
     LONG x_left, LONG y_top, VARIANT* child) {
   if (!child)
     return E_INVALIDARG;
@@ -84,7 +92,7 @@ STDMETHODIMP ViewAccessibility::accHitTest(
   return S_OK;
 }
 
-HRESULT ViewAccessibility::accDoDefaultAction(VARIANT var_id) {
+HRESULT NativeViewAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
   if (!IsValidId(var_id))
     return E_INVALIDARG;
 
@@ -100,7 +108,7 @@ HRESULT ViewAccessibility::accDoDefaultAction(VARIANT var_id) {
   return DISP_E_MEMBERNOTFOUND;
 }
 
-STDMETHODIMP ViewAccessibility::accLocation(
+STDMETHODIMP NativeViewAccessibilityWin::accLocation(
     LONG* x_left, LONG* y_top, LONG* width, LONG* height, VARIANT var_id) {
   if (!IsValidId(var_id) || !x_left || !y_top || !width || !height)
     return E_INVALIDARG;
@@ -112,8 +120,8 @@ STDMETHODIMP ViewAccessibility::accLocation(
     *width  = view_->width();
     *height = view_->height();
     gfx::Point topleft(view_->bounds().origin());
-    views::View::ConvertPointToScreen(view_->parent() ? view_->parent() : view_,
-                                      &topleft);
+    views::View::ConvertPointToScreen(
+        view_->parent() ? view_->parent() : view_, &topleft);
     *x_left = topleft.x();
     *y_top  = topleft.y();
   } else {
@@ -122,8 +130,8 @@ STDMETHODIMP ViewAccessibility::accLocation(
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::accNavigate(LONG nav_dir, VARIANT start,
-                                            VARIANT* end) {
+STDMETHODIMP NativeViewAccessibilityWin::accNavigate(
+    LONG nav_dir, VARIANT start, VARIANT* end) {
   if (start.vt != VT_I4 || !end)
     return E_INVALIDARG;
 
@@ -223,7 +231,7 @@ STDMETHODIMP ViewAccessibility::accNavigate(LONG nav_dir, VARIANT start,
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accChild(VARIANT var_child,
+STDMETHODIMP NativeViewAccessibilityWin::get_accChild(VARIANT var_child,
                                              IDispatch** disp_child) {
   if (var_child.vt != VT_I4 || !disp_child)
     return E_INVALIDARG;
@@ -266,7 +274,7 @@ STDMETHODIMP ViewAccessibility::get_accChild(VARIANT var_child,
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accChildCount(LONG* child_count) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accChildCount(LONG* child_count) {
   if (!child_count || !view_)
     return E_INVALIDARG;
 
@@ -277,7 +285,7 @@ STDMETHODIMP ViewAccessibility::get_accChildCount(LONG* child_count) {
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accDefaultAction(
+STDMETHODIMP NativeViewAccessibilityWin::get_accDefaultAction(
     VARIANT var_id, BSTR* def_action) {
   if (!IsValidId(var_id) || !def_action)
     return E_INVALIDARG;
@@ -285,7 +293,9 @@ STDMETHODIMP ViewAccessibility::get_accDefaultAction(
   if (!view_)
     return E_FAIL;
 
-  string16 temp_action = view_->GetAccessibleDefaultAction();
+  ui::AccessibleViewState state;
+  view_->GetAccessibleState(&state);
+  string16 temp_action = state.default_action;
 
   if (!temp_action.empty()) {
     *def_action = SysAllocString(temp_action.c_str());
@@ -296,7 +306,8 @@ STDMETHODIMP ViewAccessibility::get_accDefaultAction(
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accDescription(VARIANT var_id, BSTR* desc) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accDescription(
+    VARIANT var_id, BSTR* desc) {
   if (!IsValidId(var_id) || !desc)
     return E_INVALIDARG;
 
@@ -315,7 +326,7 @@ STDMETHODIMP ViewAccessibility::get_accDescription(VARIANT var_id, BSTR* desc) {
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accFocus(VARIANT* focus_child) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accFocus(VARIANT* focus_child) {
   if (!focus_child)
     return E_INVALIDARG;
 
@@ -342,7 +353,7 @@ STDMETHODIMP ViewAccessibility::get_accFocus(VARIANT* focus_child) {
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accKeyboardShortcut(
+STDMETHODIMP NativeViewAccessibilityWin::get_accKeyboardShortcut(
     VARIANT var_id, BSTR* acc_key) {
   if (!IsValidId(var_id) || !acc_key)
     return E_INVALIDARG;
@@ -350,7 +361,9 @@ STDMETHODIMP ViewAccessibility::get_accKeyboardShortcut(
   if (!view_)
     return E_FAIL;
 
-  string16 temp_key = view_->GetAccessibleKeyboardShortcut();
+  ui::AccessibleViewState state;
+  view_->GetAccessibleState(&state);
+  string16 temp_key = state.keyboard_shortcut;
 
   if (!temp_key.empty()) {
     *acc_key = SysAllocString(temp_key.c_str());
@@ -361,17 +374,18 @@ STDMETHODIMP ViewAccessibility::get_accKeyboardShortcut(
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accName(VARIANT var_id, BSTR* name) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accName(
+    VARIANT var_id, BSTR* name) {
   if (!IsValidId(var_id) || !name)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
-  string16 temp_name;
-
   // Retrieve the current view's name.
-  view_->GetAccessibleName(&temp_name);
+  ui::AccessibleViewState state;
+  view_->GetAccessibleState(&state);
+  string16 temp_name = state.name;
   if (!temp_name.empty()) {
     // Return name retrieved.
     *name = SysAllocString(temp_name.c_str());
@@ -383,7 +397,8 @@ STDMETHODIMP ViewAccessibility::get_accName(VARIANT var_id, BSTR* name) {
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accParent(IDispatch** disp_parent) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accParent(
+    IDispatch** disp_parent) {
   if (!disp_parent)
     return E_INVALIDARG;
 
@@ -400,9 +415,9 @@ STDMETHODIMP ViewAccessibility::get_accParent(IDispatch** disp_parent) {
       return S_FALSE;
     }
 
-    // For a View that has no parent (e.g. root), point the accessible parent to
-    // the default implementation, to interface with Windows' hierarchy and to
-    // support calls from e.g. WindowFromAccessibleObject.
+    // For a View that has no parent (e.g. root), point the accessible parent
+    // to the default implementation, to interface with Windows' hierarchy
+    // and to support calls from e.g. WindowFromAccessibleObject.
     HRESULT hr =
         ::AccessibleObjectFromWindow(view_->GetWidget()->GetNativeView(),
                                      OBJID_WINDOW, IID_IAccessible,
@@ -421,19 +436,23 @@ STDMETHODIMP ViewAccessibility::get_accParent(IDispatch** disp_parent) {
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accRole(VARIANT var_id, VARIANT* role) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accRole(
+    VARIANT var_id, VARIANT* role) {
   if (!IsValidId(var_id) || !role)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
+  ui::AccessibleViewState state;
+  view_->GetAccessibleState(&state);
   role->vt = VT_I4;
-  role->lVal = MSAARole(view_->GetAccessibleRole());
+  role->lVal = MSAARole(state.role);
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accState(VARIANT var_id, VARIANT* state) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accState(
+    VARIANT var_id, VARIANT* state) {
   if (!IsValidId(var_id) || !state)
     return E_INVALIDARG;
 
@@ -452,7 +471,8 @@ STDMETHODIMP ViewAccessibility::get_accState(VARIANT var_id, VARIANT* state) {
   return S_OK;
 }
 
-STDMETHODIMP ViewAccessibility::get_accValue(VARIANT var_id, BSTR* value) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accValue(
+    VARIANT var_id, BSTR* value) {
   if (!IsValidId(var_id) || !value)
     return E_INVALIDARG;
 
@@ -460,7 +480,9 @@ STDMETHODIMP ViewAccessibility::get_accValue(VARIANT var_id, BSTR* value) {
     return E_FAIL;
 
   // Retrieve the current view's value.
-  string16 temp_value = view_->GetAccessibleValue();
+  ui::AccessibleViewState state;
+  view_->GetAccessibleState(&state);
+  string16 temp_value = state.value;
 
   if (!temp_value.empty()) {
     // Return value retrieved.
@@ -476,7 +498,7 @@ STDMETHODIMP ViewAccessibility::get_accValue(VARIANT var_id, BSTR* value) {
 
 // Helper functions.
 
-bool ViewAccessibility::IsNavDirNext(int nav_dir) const {
+bool NativeViewAccessibilityWin::IsNavDirNext(int nav_dir) const {
   if (nav_dir == NAVDIR_RIGHT || nav_dir == NAVDIR_DOWN ||
       nav_dir == NAVDIR_NEXT) {
       return true;
@@ -484,8 +506,8 @@ bool ViewAccessibility::IsNavDirNext(int nav_dir) const {
   return false;
 }
 
-bool ViewAccessibility::IsValidNav(int nav_dir, int start_id, int lower_bound,
-                                   int upper_bound) const {
+bool NativeViewAccessibilityWin::IsValidNav(
+    int nav_dir, int start_id, int lower_bound, int upper_bound) const {
   if (IsNavDirNext(nav_dir)) {
     if ((start_id + 1) > upper_bound) {
       return false;
@@ -498,13 +520,14 @@ bool ViewAccessibility::IsValidNav(int nav_dir, int start_id, int lower_bound,
   return true;
 }
 
-bool ViewAccessibility::IsValidId(const VARIANT& child) const {
+bool NativeViewAccessibilityWin::IsValidId(const VARIANT& child) const {
   // View accessibility returns an IAccessible for each view so we only support
   // the CHILDID_SELF id.
   return (VT_I4 == child.vt) && (CHILDID_SELF == child.lVal);
 }
 
-void ViewAccessibility::SetState(VARIANT* msaa_state, views::View* view) {
+void NativeViewAccessibilityWin::SetState(
+    VARIANT* msaa_state, views::View* view) {
   // Ensure the output param is initialized to zero.
   msaa_state->lVal = 0;
 
@@ -524,28 +547,32 @@ void ViewAccessibility::SetState(VARIANT* msaa_state, views::View* view) {
     msaa_state->lVal |= STATE_SYSTEM_FOCUSED;
 
   // Add on any view-specific states.
-  msaa_state->lVal |= MSAAState(view->GetAccessibleState());
+  ui::AccessibleViewState view_state;
+  view->GetAccessibleState(&view_state);
+  msaa_state->lVal |= MSAAState(view_state.state);
 }
 
 // IAccessible functions not supported.
 
-STDMETHODIMP ViewAccessibility::get_accSelection(VARIANT* selected) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accSelection(VARIANT* selected) {
   if (selected)
     selected->vt = VT_EMPTY;
   return E_NOTIMPL;
 }
 
-STDMETHODIMP ViewAccessibility::accSelect(LONG flagsSelect, VARIANT var_id) {
+STDMETHODIMP NativeViewAccessibilityWin::accSelect(
+    LONG flagsSelect, VARIANT var_id) {
   return E_NOTIMPL;
 }
 
-STDMETHODIMP ViewAccessibility::get_accHelp(VARIANT var_id, BSTR* help) {
+STDMETHODIMP NativeViewAccessibilityWin::get_accHelp(
+    VARIANT var_id, BSTR* help) {
   if (help)
     *help = NULL;
   return E_NOTIMPL;
 }
 
-STDMETHODIMP ViewAccessibility::get_accHelpTopic(
+STDMETHODIMP NativeViewAccessibilityWin::get_accHelpTopic(
     BSTR* help_file, VARIANT var_id, LONG* topic_id) {
   if (help_file) {
     *help_file = NULL;
@@ -556,17 +583,19 @@ STDMETHODIMP ViewAccessibility::get_accHelpTopic(
   return E_NOTIMPL;
 }
 
-STDMETHODIMP ViewAccessibility::put_accName(VARIANT var_id, BSTR put_name) {
+STDMETHODIMP NativeViewAccessibilityWin::put_accName(
+    VARIANT var_id, BSTR put_name) {
   // Deprecated.
   return E_NOTIMPL;
 }
 
-STDMETHODIMP ViewAccessibility::put_accValue(VARIANT var_id, BSTR put_val) {
+STDMETHODIMP NativeViewAccessibilityWin::put_accValue(
+    VARIANT var_id, BSTR put_val) {
   // Deprecated.
   return E_NOTIMPL;
 }
 
-int32 ViewAccessibility::MSAAEvent(AccessibilityTypes::Event event) {
+int32 NativeViewAccessibilityWin::MSAAEvent(AccessibilityTypes::Event event) {
   switch (event) {
     case AccessibilityTypes::EVENT_ALERT:
       return EVENT_SYSTEM_ALERT;
@@ -595,7 +624,7 @@ int32 ViewAccessibility::MSAAEvent(AccessibilityTypes::Event event) {
   }
 }
 
-int32 ViewAccessibility::MSAARole(AccessibilityTypes::Role role) {
+int32 NativeViewAccessibilityWin::MSAARole(AccessibilityTypes::Role role) {
   switch (role) {
     case AccessibilityTypes::ROLE_ALERT:
 return ROLE_SYSTEM_ALERT;
@@ -660,7 +689,7 @@ return ROLE_SYSTEM_ALERT;
   }
 }
 
-int32 ViewAccessibility::MSAAState(AccessibilityTypes::State state) {
+int32 NativeViewAccessibilityWin::MSAAState(AccessibilityTypes::State state) {
   int32 msaa_state = 0;
   if (state & AccessibilityTypes::STATE_CHECKED)
     msaa_state |= STATE_SYSTEM_CHECKED;
@@ -696,7 +725,7 @@ int32 ViewAccessibility::MSAAState(AccessibilityTypes::State state) {
 }
 
 // static
-HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
+HRESULT NativeViewAccessibilityWin::GetNativeIAccessibleInterface(
     views::NativeViewHost* native_host, IAccessible** accessible) {
   if (!native_host || !accessible)
     return E_INVALIDARG;
@@ -712,7 +741,7 @@ HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
 }
 
 // static
-HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
+HRESULT NativeViewAccessibilityWin::GetNativeIAccessibleInterface(
     HWND native_view_window , IAccessible** accessible) {
   if (IsWindow(native_view_window)) {
     LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
@@ -723,3 +752,5 @@ HRESULT ViewAccessibility::GetNativeIAccessibleInterface(
 
   return E_FAIL;
 }
+
+}  // namespace views
diff --git a/views/accessibility/view_accessibility.h b/views/accessibility/native_view_accessibility_win.h
index 9e2d7b8..2e947e1 100644
--- a/views/accessibility/view_accessibility.h
+++ b/views/accessibility/native_view_accessibility_win.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
-#define VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
+#ifndef VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
+#define VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
 #pragma once
 
 #include <atlbase.h>
@@ -12,34 +12,37 @@
 #include <oleacc.h>
 
 #include "base/scoped_ptr.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/view.h"
 
+namespace views {
+
 ////////////////////////////////////////////////////////////////////////////////
 //
-// ViewAccessibility
+// NativeViewAccessibilityWin
 //
 // Class implementing the MSAA IAccessible COM interface for a generic View,
 // providing accessibility to be used by screen readers and other assistive
 // technology (AT).
 //
 ////////////////////////////////////////////////////////////////////////////////
-class ATL_NO_VTABLE ViewAccessibility
+class ATL_NO_VTABLE NativeViewAccessibilityWin
   : public CComObjectRootEx<CComMultiThreadModel>,
     public IDispatchImpl<IAccessible, &IID_IAccessible, &LIBID_Accessibility> {
  public:
-  BEGIN_COM_MAP(ViewAccessibility)
+  BEGIN_COM_MAP(NativeViewAccessibilityWin)
     COM_INTERFACE_ENTRY2(IDispatch, IAccessible)
     COM_INTERFACE_ENTRY(IAccessible)
   END_COM_MAP()
 
   // Create method for view accessibility.
-  static scoped_refptr<ViewAccessibility> Create(views::View* view);
+  static scoped_refptr<NativeViewAccessibilityWin> Create(views::View* view);
 
   // Returns the IAccessible interface for a view.
   static IAccessible* GetAccessibleForView(views::View* view);
 
-  virtual ~ViewAccessibility();
+  virtual ~NativeViewAccessibilityWin();
 
   void set_view(views::View* view) { view_ = view; }
 
@@ -112,18 +115,18 @@ class ATL_NO_VTABLE ViewAccessibility
 
   // Returns a conversion from the event (as defined in accessibility_types.h)
   // to an MSAA event.
-  static int32 MSAAEvent(AccessibilityTypes::Event event);
+  static int32 MSAAEvent(ui::AccessibilityTypes::Event event);
 
   // Returns a conversion from the Role (as defined in accessibility_types.h)
   // to an MSAA role.
-  static int32 MSAARole(AccessibilityTypes::Role role);
+  static int32 MSAARole(ui::AccessibilityTypes::Role role);
 
   // Returns a conversion from the State (as defined in accessibility_types.h)
   // to MSAA states set.
-  static int32 MSAAState(AccessibilityTypes::State state);
+  static int32 MSAAState(ui::AccessibilityTypes::State state);
 
  private:
-  ViewAccessibility();
+  NativeViewAccessibilityWin();
 
   // Determines navigation direction for accNavigate, based on left, up and
   // previous being mapped all to previous and right, down, next being mapped
@@ -157,9 +160,11 @@ class ATL_NO_VTABLE ViewAccessibility
   // Member View needed for view-specific calls.
   views::View* view_;
 
-  DISALLOW_COPY_AND_ASSIGN(ViewAccessibility);
+  DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin);
 };
 
 extern const char kViewsNativeHostPropForAccessibility[];
 
-#endif  // VIEWS_ACCESSIBILITY_VIEW_ACCESSIBILITY_H_
+}  // namespace views
+
+#endif  // VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
diff --git a/views/controls/button/button.cc b/views/controls/button/button.cc
index 7b6cc75..6d18204 100644
--- a/views/controls/button/button.cc
+++ b/views/controls/button/button.cc
@@ -3,7 +3,9 @@
 // found in the LICENSE file.
 
 #include "views/controls/button/button.h"
+
 #include "base/utf_string_conversions.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 
 namespace views {
 
@@ -18,8 +20,12 @@ void Button::SetTooltipText(const std::wstring& tooltip_text) {
   TooltipTextChanged();
 }
 
-void Button::SetAccessibleKeyboardShortcut(const std::wstring& shortcut) {
-  accessible_shortcut_ = WideToUTF16Hack(shortcut);
+void Button::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
+void Button::SetAccessibleKeyboardShortcut(const string16& shortcut) {
+  accessible_shortcut_ = shortcut;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -33,12 +39,10 @@ bool Button::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   return true;
 }
 
-string16 Button::GetAccessibleKeyboardShortcut() {
-  return accessible_shortcut_;
-}
-
-AccessibilityTypes::Role Button::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PUSHBUTTON;
+void Button::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->name = accessible_name_;
+  state->keyboard_shortcut = accessible_shortcut_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/button/button.h b/views/controls/button/button.h
index 263e45f..0c9c6c7 100644
--- a/views/controls/button/button.h
+++ b/views/controls/button/button.h
@@ -36,13 +36,13 @@ class Button : public View {
 
   int mouse_event_flags() const { return mouse_event_flags_; }
 
-  void SetAccessibleKeyboardShortcut(const std::wstring& shortcut);
+  void SetAccessibleName(const string16& name);
+  void SetAccessibleKeyboardShortcut(const string16& shortcut);
 
   // Overridden from View:
   virtual bool GetTooltipText(const gfx::Point& p,
                               std::wstring* tooltip) OVERRIDE;
-  virtual string16 GetAccessibleKeyboardShortcut() OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   // Construct the Button with a Listener. The listener can be NULL. This can be
@@ -61,6 +61,7 @@ class Button : public View {
   string16 tooltip_text_;
 
   // Accessibility data.
+  string16 accessible_name_;
   string16 accessible_shortcut_;
 
   // The id tag associated with this button. Used to disambiguate buttons in
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index d2f69e2..a5f7ab1 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -8,6 +8,7 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
@@ -165,16 +166,11 @@ void ButtonDropDown::ShowDropDownMenu(gfx::NativeView window) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-string16 ButtonDropDown::GetAccessibleDefaultAction() {
-  return l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
-}
-
-AccessibilityTypes::Role ButtonDropDown::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_BUTTONDROPDOWN;
-}
-
-AccessibilityTypes::State ButtonDropDown::GetAccessibleState() {
-  return AccessibilityTypes::STATE_HASPOPUP;
+void ButtonDropDown::GetAccessibleState(ui::AccessibleViewState* state) {
+  CustomButton::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN;
+  state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
+  state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
 }
 
 }  // namespace views
diff --git a/views/controls/button/button_dropdown.h b/views/controls/button/button_dropdown.h
index 07b8276..32f2c5c 100644
--- a/views/controls/button/button_dropdown.h
+++ b/views/controls/button/button_dropdown.h
@@ -26,9 +26,7 @@ class ButtonDropDown : public ImageButton {
   virtual ~ButtonDropDown();
 
   // Accessibility accessors, overridden from View.
-  virtual string16 GetAccessibleDefaultAction() OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
-  virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   // Overridden from CustomButton
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index 719dfd8..2a34cc5 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -5,6 +5,7 @@
 #include "views/controls/button/checkbox.h"
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/label.h"
 
@@ -158,12 +159,10 @@ void Checkbox::OnBlur() {
   label_->set_paint_as_focused(false);
 }
 
-AccessibilityTypes::Role Checkbox::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_CHECKBUTTON;
-}
-
-AccessibilityTypes::State Checkbox::GetAccessibleState() {
-  return checked() ? AccessibilityTypes::STATE_CHECKED : 0;
+void Checkbox::GetAccessibleState(ui::AccessibleViewState* state) {
+  Button::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_CHECKBUTTON;
+  state->state = checked() ? ui::AccessibilityTypes::STATE_CHECKED : 0;
 }
 
 std::string Checkbox::GetClassName() const {
diff --git a/views/controls/button/checkbox.h b/views/controls/button/checkbox.h
index 71d218d..801b0fd 100644
--- a/views/controls/button/checkbox.h
+++ b/views/controls/button/checkbox.h
@@ -57,8 +57,7 @@ class Checkbox : public NativeButton {
   virtual void OnBlur() OVERRIDE;
 
   // Accessibility accessors, overridden from View.
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
-  virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from NativeButton:
   virtual void SetLabel(const std::wstring& label) OVERRIDE;
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc
index 1696d14..fc349a2 100644
--- a/views/controls/button/custom_button.cc
+++ b/views/controls/button/custom_button.cc
@@ -4,9 +4,11 @@
 
 #include "views/controls/button/custom_button.h"
 
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/screen.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
@@ -57,24 +59,23 @@ void CustomButton::SetAnimationDuration(int duration) {
 ////////////////////////////////////////////////////////////////////////////////
 // CustomButton, View overrides:
 
-AccessibilityTypes::State CustomButton::GetAccessibleState() {
-  int state = 0;
+void CustomButton::GetAccessibleState(ui::AccessibleViewState* state) {
+  Button::GetAccessibleState(state);
   switch (state_) {
     case BS_HOT:
-      state = AccessibilityTypes::STATE_HOTTRACKED;
+      state->state = ui::AccessibilityTypes::STATE_HOTTRACKED;
       break;
     case BS_PUSHED:
-      state = AccessibilityTypes::STATE_PRESSED;
+      state->state = ui::AccessibilityTypes::STATE_PRESSED;
       break;
     case BS_DISABLED:
-      state = AccessibilityTypes::STATE_UNAVAILABLE;
+      state->state = ui::AccessibilityTypes::STATE_UNAVAILABLE;
       break;
     case BS_NORMAL:
     case BS_COUNT:
       // No additional accessibility state set for this button state.
       break;
   }
-  return state;
 }
 
 void CustomButton::SetEnabled(bool enabled) {
@@ -248,8 +249,10 @@ void CustomButton::SetHotTracked(bool flag) {
   if (state_ != BS_DISABLED)
     SetState(flag ? BS_HOT : BS_NORMAL);
 
-  if (flag)
-    NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
+  if (flag) {
+    GetWidget()->NotifyAccessibilityEvent(
+        this, ui::AccessibilityTypes::EVENT_FOCUS, true);
+  }
 }
 
 bool CustomButton::IsHotTracked() const {
diff --git a/views/controls/button/custom_button.h b/views/controls/button/custom_button.h
index 17dafbf..1a0f75e 100644
--- a/views/controls/button/custom_button.h
+++ b/views/controls/button/custom_button.h
@@ -48,7 +48,7 @@ class CustomButton : public Button,
   void SetAnimationDuration(int duration);
 
   // Overridden from View:
-  virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void SetEnabled(bool enabled) OVERRIDE;
   virtual bool IsEnabled() const OVERRIDE;
   virtual bool IsFocusable() const OVERRIDE;
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index f88b106..db138bb 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -7,6 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -260,16 +261,11 @@ void MenuButton::OnMouseExited(const MouseEvent& event) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-string16 MenuButton::GetAccessibleDefaultAction() {
-  return l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
-}
-
-AccessibilityTypes::Role MenuButton::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_BUTTONMENU;
-}
-
-AccessibilityTypes::State MenuButton::GetAccessibleState() {
-  return AccessibilityTypes::STATE_HASPOPUP;
+void MenuButton::GetAccessibleState(ui::AccessibleViewState* state) {
+  CustomButton::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_BUTTONMENU;
+  state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
+  state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
 }
 
 std::string MenuButton::GetClassName() const {
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index 55f5a89..c6f3092 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -58,9 +58,7 @@ class MenuButton : public TextButton {
   virtual bool OnKeyReleased(const KeyEvent& e);
 
   // Accessibility accessors, overridden from View.
-  virtual string16 GetAccessibleDefaultAction() OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
-  virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Returns views/MenuButton.
   virtual std::string GetClassName() const;
diff --git a/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc
index fbba56a..2783c84 100644
--- a/views/controls/button/native_button_win.cc
+++ b/views/controls/button/native_button_win.cc
@@ -11,6 +11,7 @@
 #include "base/win/scoped_comptr.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/radio_button.h"
@@ -71,18 +72,19 @@ void NativeButtonWin::UpdateDefault() {
 }
 
 void NativeButtonWin::UpdateAccessibleName() {
-  string16 name;
-  if (native_button_->GetAccessibleName(&name)) {
-    base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
-    HRESULT hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
-        IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
-    if (SUCCEEDED(hr)) {
-      VARIANT var;
-      var.vt = VT_BSTR;
-      var.bstrVal = SysAllocString(name.c_str());
-      hr = pAccPropServices->SetHwndProp(native_view(), OBJID_WINDOW,
-          CHILDID_SELF, PROPID_ACC_NAME, var);
-    }
+  ui::AccessibleViewState state;
+  native_button_->GetAccessibleState(&state);
+  string16 name = state.name;
+  base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
+  HRESULT hr = CoCreateInstance(
+      CLSID_AccPropServices, NULL, CLSCTX_SERVER,
+      IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
+  if (SUCCEEDED(hr)) {
+    VARIANT var;
+    var.vt = VT_BSTR;
+    var.bstrVal = SysAllocString(name.c_str());
+    hr = pAccPropServices->SetHwndProp(native_view(), OBJID_WINDOW,
+                                       CHILDID_SELF, PROPID_ACC_NAME, var);
   }
 }
 
diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc
index 4074da4..f162f2c 100644
--- a/views/controls/button/radio_button.cc
+++ b/views/controls/button/radio_button.cc
@@ -5,6 +5,7 @@
 #include "views/controls/button/radio_button.h"
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/root_view.h"
 
 namespace views {
@@ -60,8 +61,9 @@ void RadioButton::SetChecked(bool checked) {
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, View overrides:
 
-AccessibilityTypes::Role RadioButton::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_RADIOBUTTON;
+void RadioButton::GetAccessibleState(ui::AccessibleViewState* state) {
+  Checkbox::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
 View* RadioButton::GetSelectedViewForGroup(int group_id) {
diff --git a/views/controls/button/radio_button.h b/views/controls/button/radio_button.h
index 7ea35f5..5ff6f76 100644
--- a/views/controls/button/radio_button.h
+++ b/views/controls/button/radio_button.h
@@ -22,16 +22,18 @@ class RadioButton : public Checkbox {
   virtual ~RadioButton();
 
   // Overridden from Checkbox:
-  virtual void SetChecked(bool checked);
+  virtual void SetChecked(bool checked) OVERRIDE;
 
   // Overridden from View:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual View* GetSelectedViewForGroup(int group_id);
-  virtual bool IsGroupFocusTraversable() const;
-  virtual void OnMouseReleased(const MouseEvent& event, bool canceled);
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual View* GetSelectedViewForGroup(int group_id) OVERRIDE;
+  virtual bool IsGroupFocusTraversable() const OVERRIDE;
+  virtual void OnMouseReleased(const MouseEvent& event, bool canceled)
+      OVERRIDE;
 
  protected:
-  virtual std::string GetClassName() const;
+  // Overridden from View:
+  virtual std::string GetClassName() const OVERRIDE;
 
   // Overridden from NativeButton:
   virtual NativeButtonWrapper* CreateWrapper();
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index be7d719..2f77942 100644
--- a/views/controls/combobox/combobox.cc
+++ b/views/controls/combobox/combobox.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/combobox_model.h"
 #include "views/controls/combobox/native_combobox_wrapper.h"
@@ -52,6 +53,10 @@ void Combobox::SelectionChanged() {
     listener_->ItemChanged(this, prev_selected_item, selected_item_);
 }
 
+void Combobox::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Combobox, View overrides:
 
@@ -89,12 +94,10 @@ void Combobox::OnPaintFocusBorder(gfx::Canvas* canvas) {
     View::OnPaintFocusBorder(canvas);
 }
 
-AccessibilityTypes::Role Combobox::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_COMBOBOX;
-}
-
-string16 Combobox::GetAccessibleValue() {
-  return model_->GetItemAt(selected_item_);
+void Combobox::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_COMBOBOX;
+  state->name = accessible_name_;
+  state->value = model_->GetItemAt(selected_item_);
 }
 
 void Combobox::OnFocus() {
diff --git a/views/controls/combobox/combobox.h b/views/controls/combobox/combobox.h
index 1de06d6..c50fadd 100644
--- a/views/controls/combobox/combobox.h
+++ b/views/controls/combobox/combobox.h
@@ -58,20 +58,23 @@ class Combobox : public View {
   // Accessor for |model_|.
   ComboboxModel* model() const { return model_; }
 
+  // Set the accessible name of the combo box.
+  void SetAccessibleName(const string16& name);
+
   // Overridden from View:
-  virtual gfx::Size GetPreferredSize();
-  virtual void Layout();
-  virtual void SetEnabled(bool enabled);
-  virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e);
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
-  virtual string16 GetAccessibleValue() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void SetEnabled(bool enabled) OVERRIDE;
+  virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE;
+  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
-  virtual void OnFocus();
+  // Overridden from View:
+  virtual void OnFocus() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
-                                    View* child);
-  virtual std::string GetClassName() const;
+                                    View* child) OVERRIDE;
+  virtual std::string GetClassName() const OVERRIDE;
 
   // The object that actually implements the native combobox.
   NativeComboboxWrapper* native_wrapper_;
@@ -86,6 +89,9 @@ class Combobox : public View {
   // The current selection.
   int selected_item_;
 
+  // The accessible name of the text field.
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(Combobox);
 };
 
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index 7f05e97..bc86e55 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/insets.h"
 
@@ -126,8 +127,9 @@ void ImageView::OnPaint(gfx::Canvas* canvas) {
   }
 }
 
-AccessibilityTypes::Role ImageView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GRAPHIC;
+void ImageView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GRAPHIC;
+  state->name = tooltip_text_;
 }
 
 void ImageView::SetHorizontalAlignment(Alignment ha) {
@@ -154,7 +156,6 @@ ImageView::Alignment ImageView::GetVerticalAlignment() {
 
 void ImageView::SetTooltipText(const std::wstring& tooltip) {
   tooltip_text_ = WideToUTF16Hack(tooltip);
-  SetAccessibleName(WideToUTF16Hack(tooltip));
 }
 
 std::wstring ImageView::GetTooltipText() {
diff --git a/views/controls/image_view.h b/views/controls/image_view.h
index b1791ac..cde4bfd 100644
--- a/views/controls/image_view.h
+++ b/views/controls/image_view.h
@@ -75,10 +75,11 @@ class ImageView : public View {
   std::wstring GetTooltipText();
 
   // Overriden from View
-  virtual gfx::Size GetPreferredSize();
-  virtual void OnPaint(gfx::Canvas* canvas);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
+      OVERRIDE;
 
  private:
   // Compute the image origin given the desired size and the receiver alignment
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 1b105f0..6fedc80 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -12,6 +12,7 @@
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia.h"
@@ -106,7 +107,6 @@ void Label::SetText(const std::wstring& text) {
   text_ = WideToUTF16Hack(text);
   url_set_ = false;
   text_size_valid_ = false;
-  SetAccessibleName(WideToUTF16Hack(text));
   PreferredSizeChanged();
   SchedulePaint();
 }
@@ -250,12 +250,10 @@ void Label::SizeToFit(int max_width) {
   SizeToPreferredSize();
 }
 
-AccessibilityTypes::Role Label::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_STATICTEXT;
-}
-
-AccessibilityTypes::State Label::GetAccessibleState() {
-  return AccessibilityTypes::STATE_READONLY;
+void Label::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_STATICTEXT;
+  state->state = ui::AccessibilityTypes::STATE_READONLY;
+  state->name = text_;
 }
 
 void Label::SetHasFocusBorder(bool has_focus_border) {
diff --git a/views/controls/label.h b/views/controls/label.h
index d916659..a0ef7d2 100644
--- a/views/controls/label.h
+++ b/views/controls/label.h
@@ -79,7 +79,7 @@ class Label : public View {
   virtual void OnPaintBackground(gfx::Canvas* canvas);
 
   // Set the font.
-  void SetFont(const gfx::Font& font);
+  virtual void SetFont(const gfx::Font& font);
 
   // Set the label text.
   void SetText(const std::wstring& text);
@@ -180,8 +180,7 @@ class Label : public View {
   void SizeToFit(int max_width);
 
   // Accessibility accessors, overridden from View.
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Gets/sets the flag to determine whether the label should be collapsed when
   // it's hidden (not visible). If this flag is true, the label will return a
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 6d2ba91..a7b2ac2 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "views/border.h"
@@ -159,13 +160,11 @@ TEST(LabelTest, Accessibility) {
   string16 test_text(ASCIIToUTF16("My special text."));
   label.SetText(UTF16ToWideHack(test_text));
 
-  EXPECT_EQ(AccessibilityTypes::ROLE_STATICTEXT, label.GetAccessibleRole());
-
-  string16 name;
-  EXPECT_TRUE(label.GetAccessibleName(&name));
-  EXPECT_EQ(test_text, name);
-
-  EXPECT_TRUE(AccessibilityTypes::STATE_READONLY & label.GetAccessibleState());
+  ui::AccessibleViewState state;
+  label.GetAccessibleState(&state);
+  EXPECT_EQ(ui::AccessibilityTypes::ROLE_STATICTEXT, state.role);
+  EXPECT_EQ(test_text, state.name);
+  EXPECT_TRUE(ui::AccessibilityTypes::STATE_READONLY & state.state);
 }
 
 TEST(LabelTest, SingleLineSizing) {
diff --git a/views/controls/link.cc b/views/controls/link.cc
index de7512b..c6e22f1 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -9,6 +9,7 @@
 #endif
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
@@ -148,8 +149,9 @@ bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
       (e.key_code() == ui::VKEY_RETURN);
 }
 
-AccessibilityTypes::Role Link::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_LINK;
+void Link::GetAccessibleState(ui::AccessibleViewState* state) {
+  Label::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_LINK;
 }
 
 void Link::SetFont(const gfx::Font& font) {
diff --git a/views/controls/link.h b/views/controls/link.h
index 4c9cb8f..e616317 100644
--- a/views/controls/link.h
+++ b/views/controls/link.h
@@ -46,16 +46,16 @@ class Link : public Label {
   const LinkController* GetController();
 
   // Overridden from View:
-  virtual bool OnMousePressed(const MouseEvent& event);
-  virtual bool OnMouseDragged(const MouseEvent& event);
+  virtual bool OnMousePressed(const MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseDragged(const MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const MouseEvent& event,
-                               bool canceled);
-  virtual bool OnKeyPressed(const KeyEvent& e);
-  virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e);
+                               bool canceled) OVERRIDE;
+  virtual bool OnKeyPressed(const KeyEvent& e) OVERRIDE;
+  virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
-  // Accessibility accessors, overridden from View:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual void SetFont(const gfx::Font& font);
+  // Overridden from Label:
+  virtual void SetFont(const gfx::Font& font) OVERRIDE;
 
   // Set whether the link is enabled.
   virtual void SetEnabled(bool f);
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 906bd40..075b92e 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -760,8 +760,10 @@ void MenuController::SetSelection(MenuItemView* menu_item,
   // Notify an accessibility focus event on all menu items except for the root.
   if (menu_item &&
       (MenuDepth(menu_item) != 1 ||
-          menu_item->GetType() != MenuItemView::SUBMENU))
-    menu_item->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
+       menu_item->GetType() != MenuItemView::SUBMENU)) {
+    menu_item->GetWidget()->NotifyAccessibilityEvent(
+        menu_item, ui::AccessibilityTypes::EVENT_FOCUS, true);
+  }
 }
 
 // static
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index ed44c3a..c729c2e 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -6,6 +6,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/canvas.h"
@@ -116,27 +117,23 @@ bool MenuItemView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   return false;
 }
 
-AccessibilityTypes::Role MenuItemView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_MENUITEM;
-}
-
-AccessibilityTypes::State MenuItemView::GetAccessibleState() {
-  int state = 0;
+void MenuItemView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_MENUITEM;
+  state->name = GetAccessibleNameForMenuItem(title_, GetAcceleratorText());
   switch (GetType()) {
     case SUBMENU:
-      state |= AccessibilityTypes::STATE_HASPOPUP;
+      state->state |= ui::AccessibilityTypes::STATE_HASPOPUP;
       break;
     case CHECKBOX:
     case RADIO:
-      state |= GetDelegate()->IsItemChecked(GetCommand()) ?
-          AccessibilityTypes::STATE_CHECKED : 0;
+      state->state |= GetDelegate()->IsItemChecked(GetCommand()) ?
+          ui::AccessibilityTypes::STATE_CHECKED : 0;
       break;
     case NORMAL:
     case SEPARATOR:
       // No additional accessibility states currently for these menu states.
       break;
   }
-  return state;
 }
 
 // static
@@ -320,7 +317,6 @@ SubmenuView* MenuItemView::CreateSubmenu() {
 
 void MenuItemView::SetTitle(const std::wstring& title) {
   title_ = WideToUTF16Hack(title);
-  SetAccessibleName(GetAccessibleNameForMenuItem(title_, GetAcceleratorText()));
   pref_size_.SetSize(0, 0);  // Triggers preferred size recalculation.
 }
 
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 5b5e09c..89eab3c 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -93,9 +93,9 @@ class MenuItemView : public View {
   virtual ~MenuItemView();
 
   // Overridden from View:
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
+      OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Returns the preferred height of menu items. This is only valid when the
   // menu is about to be shown.
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index 6089838..7a644b1 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -10,6 +10,7 @@
 #include <Vssym32.h>
 #endif
 
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "views/border.h"
@@ -162,7 +163,8 @@ class MenuScrollViewContainer::MenuScrollView : public View {
 
 // MenuScrollViewContainer ----------------------------------------------------
 
-MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) {
+MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
+    : content_view_(content_view) {
   scroll_up_button_ = new MenuScrollButton(content_view, true);
   scroll_down_button_ = new MenuScrollButton(content_view, false);
   AddChildView(scroll_up_button_);
@@ -266,14 +268,16 @@ gfx::Size MenuScrollViewContainer::GetPreferredSize() {
   return prefsize;
 }
 
-AccessibilityTypes::Role MenuScrollViewContainer::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_MENUBAR;
-}
+void MenuScrollViewContainer::GetAccessibleState(
+    ui::AccessibleViewState* state) {
+  // Get the name from the submenu view.
+  content_view_->GetAccessibleState(state);
 
-AccessibilityTypes::State MenuScrollViewContainer::GetAccessibleState() {
+  // Now change the role.
+  state->role = ui::AccessibilityTypes::ROLE_MENUBAR;
   // Some AT (like NVDA) will not process focus events on menu item children
   // unless a parent claims to be focused.
-  return AccessibilityTypes::STATE_FOCUSED;
+  state->state = ui::AccessibilityTypes::STATE_FOCUSED;
 }
 
 }  // namespace views
diff --git a/views/controls/menu/menu_scroll_view_container.h b/views/controls/menu/menu_scroll_view_container.h
index 5472091..48914af 100644
--- a/views/controls/menu/menu_scroll_view_container.h
+++ b/views/controls/menu/menu_scroll_view_container.h
@@ -24,12 +24,11 @@ class MenuScrollViewContainer : public View {
   View* scroll_up_button() const { return scroll_up_button_; }
 
   // View overrides.
-  virtual void OnPaintBackground(gfx::Canvas* canvas);
-  virtual void Layout();
-  virtual void OnBoundsChanged();
-  virtual gfx::Size GetPreferredSize();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void OnBoundsChanged() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   class MenuScrollView;
@@ -41,6 +40,9 @@ class MenuScrollViewContainer : public View {
   // The scroll view.
   MenuScrollView* scroll_view_;
 
+  // The content view.
+  SubmenuView* content_view_;
+
   DISALLOW_COPY_AND_ASSIGN(MenuScrollViewContainer);
 };
 
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index 7c1f69e..fb78762 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -4,12 +4,14 @@
 
 #include "views/controls/menu/submenu_view.h"
 
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/widget/root_view.h"
+#include "views/widget/widget.h"
 
 // Height of the drop indicator. This should be an even number.
 static const int kDropIndicatorHeight = 2;
@@ -125,8 +127,10 @@ void SubmenuView::OnBoundsChanged() {
   SchedulePaint();
 }
 
-AccessibilityTypes::Role SubmenuView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_MENUPOPUP;
+void SubmenuView::GetAccessibleState(ui::AccessibleViewState* state) {
+  // Inherit most of the state from the parent menu item, except the role.
+  GetMenuItem()->GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_MENUPOPUP;
 }
 
 void SubmenuView::PaintChildren(gfx::Canvas* canvas) {
@@ -233,10 +237,14 @@ void SubmenuView::ShowAt(gfx::NativeWindow parent,
   if (host_) {
     host_->ShowMenuHost(do_capture);
 
-    GetScrollViewContainer()->NotifyAccessibilityEvent(
-        AccessibilityTypes::EVENT_MENUSTART);
-
-    NotifyAccessibilityEvent(AccessibilityTypes::EVENT_MENUPOPUPSTART);
+    GetScrollViewContainer()->GetWidget()->NotifyAccessibilityEvent(
+        GetScrollViewContainer(),
+        ui::AccessibilityTypes::EVENT_MENUSTART,
+        true);
+    GetWidget()->NotifyAccessibilityEvent(
+        this,
+        ui::AccessibilityTypes::EVENT_MENUPOPUPSTART,
+        true);
     return;
   }
 
@@ -247,10 +255,14 @@ void SubmenuView::ShowAt(gfx::NativeWindow parent,
   ScrollRectToVisible(gfx::Rect(gfx::Point(), gfx::Size(1, 1)));
   host_->Init(parent, bounds, scroll_view_container_, do_capture);
 
-  GetScrollViewContainer()->NotifyAccessibilityEvent(
-      AccessibilityTypes::EVENT_MENUSTART);
-
-  NotifyAccessibilityEvent(AccessibilityTypes::EVENT_MENUPOPUPSTART);
+  GetScrollViewContainer()->GetWidget()->NotifyAccessibilityEvent(
+      GetScrollViewContainer(),
+      ui::AccessibilityTypes::EVENT_MENUSTART,
+      true);
+  GetWidget()->NotifyAccessibilityEvent(
+      this,
+      ui::AccessibilityTypes::EVENT_MENUPOPUPSTART,
+      true);
 }
 
 void SubmenuView::Reposition(const gfx::Rect& bounds) {
@@ -260,10 +272,14 @@ void SubmenuView::Reposition(const gfx::Rect& bounds) {
 
 void SubmenuView::Close() {
   if (host_) {
-    NotifyAccessibilityEvent(AccessibilityTypes::EVENT_MENUPOPUPEND);
-
-    GetScrollViewContainer()->NotifyAccessibilityEvent(
-        AccessibilityTypes::EVENT_MENUEND);
+    GetWidget()->NotifyAccessibilityEvent(
+        this,
+        ui::AccessibilityTypes::EVENT_MENUPOPUPEND,
+        true);
+    GetScrollViewContainer()->GetWidget()->NotifyAccessibilityEvent(
+        GetScrollViewContainer(),
+        ui::AccessibilityTypes::EVENT_MENUEND,
+        true);
 
     host_->DestroyMenuHost();
     host_ = NULL;
@@ -308,12 +324,6 @@ MenuScrollViewContainer* SubmenuView::GetScrollViewContainer() {
     scroll_view_container_ = new MenuScrollViewContainer(this);
     // Otherwise MenuHost would delete us.
     scroll_view_container_->set_parent_owned(false);
-
-    // Use the parent menu item accessible name for the menu view.
-    string16 accessible_name;
-    GetMenuItem()->GetAccessibleName(&accessible_name);
-    scroll_view_container_->SetAccessibleName(accessible_name);
-    SetAccessibleName(accessible_name);
   }
   return scroll_view_container_;
 }
diff --git a/views/controls/menu/submenu_view.h b/views/controls/menu/submenu_view.h
index cbe2674..c16c081 100644
--- a/views/controls/menu/submenu_view.h
+++ b/views/controls/menu/submenu_view.h
@@ -50,15 +50,15 @@ class SubmenuView : public View {
 
   // Positions and sizes the child views. This tiles the views vertically,
   // giving each child the available width.
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
+  virtual void Layout() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // View method. Overridden to schedule a paint. We do this so that when
   // scrolling occurs, everything is repainted correctly.
-  virtual void OnBoundsChanged();
+  virtual void OnBoundsChanged() OVERRIDE;
 
   // Override from View.
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Painting.
   void PaintChildren(gfx::Canvas* canvas);
@@ -66,16 +66,16 @@ class SubmenuView : public View {
   // Drag and drop methods. These are forwarded to the MenuController.
   virtual bool GetDropFormats(
       int* formats,
-      std::set<OSExchangeData::CustomFormat>* custom_formats);
-  virtual bool AreDropTypesRequired();
-  virtual bool CanDrop(const OSExchangeData& data);
-  virtual void OnDragEntered(const DropTargetEvent& event);
-  virtual int OnDragUpdated(const DropTargetEvent& event);
-  virtual void OnDragExited();
-  virtual int OnPerformDrop(const DropTargetEvent& event);
+      std::set<OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
+  virtual bool AreDropTypesRequired() OVERRIDE;
+  virtual bool CanDrop(const OSExchangeData& data) OVERRIDE;
+  virtual void OnDragEntered(const DropTargetEvent& event) OVERRIDE;
+  virtual int OnDragUpdated(const DropTargetEvent& event) OVERRIDE;
+  virtual void OnDragExited() OVERRIDE;
+  virtual int OnPerformDrop(const DropTargetEvent& event) OVERRIDE;
 
   // Scrolls on menu item boundaries.
-  virtual bool OnMouseWheel(const MouseWheelEvent& e);
+  virtual bool OnMouseWheel(const MouseWheelEvent& e) OVERRIDE;
 
   // Returns true if the menu is showing.
   bool IsShowing();
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 34e243e..08d6843 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -12,6 +12,7 @@
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
@@ -281,7 +282,8 @@ void NativeControl::OnFocus() {
   if (container_) {
     DCHECK(container_->GetControl());
     ::SetFocus(container_->GetControl());
-    NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS, false);
+    GetWidget()->NotifyAccessibilityEvent(
+        this, ui::AccessibilityTypes::EVENT_FOCUS, false);
   }
 }
 
diff --git a/views/controls/native_control_gtk.cc b/views/controls/native_control_gtk.cc
index a17c4cb..88035c1 100644
--- a/views/controls/native_control_gtk.cc
+++ b/views/controls/native_control_gtk.cc
@@ -7,7 +7,9 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "views/focus/focus_manager.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
@@ -66,8 +68,8 @@ void NativeControlGtk::VisibilityChanged(View* starting_from, bool is_visible) {
 void NativeControlGtk::OnFocus() {
   DCHECK(native_view());
   gtk_widget_grab_focus(native_view());
-
-  parent()->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
+  GetWidget()->NotifyAccessibilityEvent(
+      parent(), ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
 void NativeControlGtk::NativeControlCreated(GtkWidget* native_control) {
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index 7e7312b..13a8c2b 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -7,10 +7,12 @@
 #include <windowsx.h>
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/focus/focus_manager.h"
+#include "views/widget/widget.h"
 
 using ui::ViewProp;
 
@@ -112,8 +114,8 @@ void NativeControlWin::OnFocus() {
       parent_view->HasFocus();
 
   // Send the accessibility focus notification.
-  parent_view->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS,
-                                        send_native_event);
+  parent_view->GetWidget()->NotifyAccessibilityEvent(
+      parent_view, ui::AccessibilityTypes::EVENT_FOCUS, send_native_event);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index a6aabb1..e460e27 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -11,6 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
@@ -310,12 +311,9 @@ void ProgressBar::SetEnabled(bool enabled) {
   // TODO(denisromanov): Need to switch progress bar color here?
 }
 
-AccessibilityTypes::Role ProgressBar::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PROGRESSBAR;
-}
-
-AccessibilityTypes::State ProgressBar::GetAccessibleState() {
-  return AccessibilityTypes::STATE_READONLY;
+void ProgressBar::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PROGRESSBAR;
+  state->state = ui::AccessibilityTypes::STATE_READONLY;
 }
 
 }  // namespace views
diff --git a/views/controls/progress_bar.h b/views/controls/progress_bar.h
index b2f1202..4366519 100644
--- a/views/controls/progress_bar.h
+++ b/views/controls/progress_bar.h
@@ -52,14 +52,14 @@ class ProgressBar : public View {
   virtual void SetTooltipText(const std::wstring& tooltip_text);
 
   // Gets the tooltip text if has been specified with SetTooltipText().
-  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
+  virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip)
+      OVERRIDE;
 
   // Sets the enabled state.
-  virtual void SetEnabled(bool enabled);
+  virtual void SetEnabled(bool enabled) OVERRIDE;
 
   // Accessibility accessors, overridden from View.
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Maximum value of progress.
   static const int kMaxProgress;
diff --git a/views/controls/progress_bar_unittest.cc b/views/controls/progress_bar_unittest.cc
index 55acfd4..c7fc4df 100644
--- a/views/controls/progress_bar_unittest.cc
+++ b/views/controls/progress_bar_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/progress_bar.h"
 
 namespace views {
@@ -48,17 +49,11 @@ TEST(ProgressBarTest, Accessibility) {
   ProgressBar bar;
   bar.SetProgress(62);
 
-  EXPECT_EQ(AccessibilityTypes::ROLE_PROGRESSBAR, bar.GetAccessibleRole());
-
-  string16 name;
-  EXPECT_FALSE(bar.GetAccessibleName(&name));
-  EXPECT_EQ(string16(), name);
-  string16 accessible_name = ASCIIToUTF16("My progress bar");
-  bar.SetAccessibleName(accessible_name);
-  EXPECT_TRUE(bar.GetAccessibleName(&name));
-  EXPECT_EQ(accessible_name, name);
-
-  EXPECT_TRUE(AccessibilityTypes::STATE_READONLY & bar.GetAccessibleState());
+  ui::AccessibleViewState state;
+  bar.GetAccessibleState(&state);
+  EXPECT_EQ(ui::AccessibilityTypes::ROLE_PROGRESSBAR, state.role);
+  EXPECT_EQ(string16(), state.name);
+  EXPECT_TRUE(ui::AccessibilityTypes::STATE_READONLY & state.state);
 }
 
 }  // namespace views
diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc
index b3897bb..0769cf9 100644
--- a/views/controls/resize_area.cc
+++ b/views/controls/resize_area.cc
@@ -5,6 +5,7 @@
 #include "views/controls/resize_area.h"
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_LINUX)
@@ -74,8 +75,8 @@ void ResizeArea::OnMouseReleased(const views::MouseEvent& event,
   ReportResizeAmount(canceled ? initial_position_ : event.x(), true);
 }
 
-AccessibilityTypes::Role ResizeArea::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_SEPARATOR;
+void ResizeArea::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_SEPARATOR;
 }
 
 void ResizeArea::ReportResizeAmount(int resize_amount, bool last_update) {
diff --git a/views/controls/resize_area.h b/views/controls/resize_area.h
index 9adb60c..cf9bea7 100644
--- a/views/controls/resize_area.h
+++ b/views/controls/resize_area.h
@@ -41,13 +41,14 @@ class ResizeArea : public View {
   virtual ~ResizeArea();
 
   // Overridden from views::View:
-  virtual std::string GetClassName() const;
+  virtual std::string GetClassName() const OVERRIDE;
   virtual gfx::NativeCursor GetCursorForPoint(ui::EventType event_type,
-                                              const gfx::Point& p);
-  virtual bool OnMousePressed(const views::MouseEvent& event);
-  virtual bool OnMouseDragged(const views::MouseEvent& event);
-  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+                                              const gfx::Point& p) OVERRIDE;
+  virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled)
+      OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  private:
   // Report the amount the user resized by to the delegate, accounting for
diff --git a/views/controls/scrollbar/scroll_bar.cc b/views/controls/scrollbar/scroll_bar.cc
index 94360bb..880a42a 100644
--- a/views/controls/scrollbar/scroll_bar.cc
+++ b/views/controls/scrollbar/scroll_bar.cc
@@ -5,6 +5,7 @@
 #include "views/controls/scrollbar/scroll_bar.h"
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 
 namespace views {
 
@@ -22,8 +23,8 @@ ScrollBar::ScrollBar(bool is_horiz) : is_horiz_(is_horiz),
 ScrollBar::~ScrollBar() {
 }
 
-AccessibilityTypes::Role ScrollBar::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_SCROLLBAR;
+void ScrollBar::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_SCROLLBAR;
 }
 
 bool ScrollBar::IsHorizontal() const {
diff --git a/views/controls/scrollbar/scroll_bar.h b/views/controls/scrollbar/scroll_bar.h
index faed881..d7f187b 100644
--- a/views/controls/scrollbar/scroll_bar.h
+++ b/views/controls/scrollbar/scroll_bar.h
@@ -60,7 +60,7 @@ class ScrollBar : public View {
   virtual ~ScrollBar();
 
   // Overridden from View:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Return whether this scrollbar is horizontal
   bool IsHorizontal() const;
diff --git a/views/controls/separator.cc b/views/controls/separator.cc
index 1a3ca70..bc1f522 100644
--- a/views/controls/separator.cc
+++ b/views/controls/separator.cc
@@ -5,6 +5,7 @@
 #include "views/controls/separator.h"
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #if defined(OS_LINUX)
 #include "views/controls/native_control_gtk.h"
 #elif defined(OS_WIN)
@@ -92,8 +93,8 @@ std::string Separator::GetClassName() const {
   return kViewClassName;
 }
 
-AccessibilityTypes::Role Separator::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_SEPARATOR;
+void Separator::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_SEPARATOR;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/separator.h b/views/controls/separator.h
index 186d84f..6c4d9c4 100644
--- a/views/controls/separator.h
+++ b/views/controls/separator.h
@@ -24,14 +24,15 @@ class Separator : public View {
   virtual ~Separator();
 
   // Overridden from View:
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void Layout() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
+  // Overridden from View:
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
-                                    View* child);
-  virtual std::string GetClassName() const;
+                                    View* child) OVERRIDE;
+  virtual std::string GetClassName() const OVERRIDE;
 
  private:
   void CreateNativeWrapper();
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index 2b076d6..96302f7 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -9,6 +9,7 @@
 #endif
 
 #include "skia/ext/skia_utils_win.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "views/background.h"
 
@@ -65,8 +66,9 @@ void SingleSplitView::Layout() {
   View::Layout();
 }
 
-AccessibilityTypes::Role SingleSplitView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_GROUPING;
+void SingleSplitView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+  state->name = accessible_name_;
 }
 
 gfx::Size SingleSplitView::GetPreferredSize() {
@@ -150,6 +152,10 @@ void SingleSplitView::CalculateChildrenBounds(
   }
 }
 
+void SingleSplitView::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
 bool SingleSplitView::OnMousePressed(const MouseEvent& event) {
   if (!IsPointInDivider(event.location()))
     return false;
diff --git a/views/controls/single_split_view.h b/views/controls/single_split_view.h
index dc69c67..38e7bbb 100644
--- a/views/controls/single_split_view.h
+++ b/views/controls/single_split_view.h
@@ -42,7 +42,7 @@ class SingleSplitView : public views::View {
   virtual void OnBoundsChanged();
   virtual void Layout();
 
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // SingleSplitView's preferred size is the sum of the preferred widths
   // and the max of the heights.
@@ -75,6 +75,8 @@ class SingleSplitView : public views::View {
                                gfx::Rect* leading_bounds,
                                gfx::Rect* trailing_bounds) const;
 
+  void SetAccessibleName(const string16& name);
+
  protected:
   virtual bool OnMousePressed(const MouseEvent& event);
   virtual bool OnMouseDragged(const MouseEvent& event);
@@ -132,6 +134,9 @@ class SingleSplitView : public views::View {
   // Observer to notify about user initiated handle movements. Not own by us.
   Observer* observer_;
 
+  // The accessible name of this view.
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(SingleSplitView);
 };
 
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index eb9f971..1091407 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -5,11 +5,13 @@
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 // TODO(avi): remove when not needed
 #include "base/utf_string_conversions.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
@@ -38,7 +40,6 @@ void TabbedPane::AddTabAtIndex(int index,
                                bool select_if_first_tab) {
   native_tabbed_pane_->AddTabAtIndex(index, title, contents,
                                      select_if_first_tab);
-  contents->SetAccessibleName(WideToUTF16Hack(title));
   PreferredSizeChanged();
 }
 
@@ -60,6 +61,10 @@ void TabbedPane::SelectTabAt(int index) {
   native_tabbed_pane_->SelectTabAt(index);
 }
 
+void TabbedPane::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
 int TabbedPane::GetTabCount() {
   return native_tabbed_pane_->GetTabCount();
 }
@@ -118,8 +123,10 @@ void TabbedPane::OnFocus() {
     native_tabbed_pane_->SetFocus();
 
     View* selected_tab = GetSelectedTab();
-    if (selected_tab)
-       selected_tab->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
+    if (selected_tab) {
+      selected_tab->GetWidget()->NotifyAccessibilityEvent(
+          selected_tab, ui::AccessibilityTypes::EVENT_FOCUS, true);
+    }
   }
   else
     View::OnFocus();  // Will focus the RootView window (so we still get
@@ -131,8 +138,9 @@ void TabbedPane::OnPaintFocusBorder(gfx::Canvas* canvas) {
     View::OnPaintFocusBorder(canvas);
 }
 
-AccessibilityTypes::Role TabbedPane::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_PAGETABLIST;
+void TabbedPane::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
+  state->name = accessible_name_;
 }
 
 gfx::Size TabbedPane::GetPreferredSize() {
diff --git a/views/controls/tabbed_pane/tabbed_pane.h b/views/controls/tabbed_pane/tabbed_pane.h
index 4fdb727..a968d36 100644
--- a/views/controls/tabbed_pane/tabbed_pane.h
+++ b/views/controls/tabbed_pane/tabbed_pane.h
@@ -14,7 +14,6 @@ class NativeTabbedPaneWrapper;
 
 // The TabbedPane class is a view that shows tabs.  When the user clicks on a
 // tab, the associated view is displayed.
-
 class TabbedPane : public View {
  public:
   TabbedPane();
@@ -63,16 +62,20 @@ class TabbedPane : public View {
 
   Listener* listener() const { return listener_; }
 
+  void SetAccessibleName(const string16& name);
+
   // View overrides:
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
+      OVERRIDE;
   // Handles Ctrl+Tab and Ctrl+Shift+Tab navigation of pages.
-  virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
-  virtual std::string GetClassName() const;
-  virtual void Layout();
-  virtual void OnFocus();
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual gfx::Size GetPreferredSize();
+  virtual bool AcceleratorPressed(const views::Accelerator& accelerator)
+      OVERRIDE;
+  virtual std::string GetClassName() const OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void OnFocus() OVERRIDE;
+  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   NativeTabbedPaneWrapper* native_wrapper() const {
     return native_tabbed_pane_;
@@ -96,6 +99,9 @@ class TabbedPane : public View {
   // The listener we notify about tab selection changes.
   Listener* listener_;
 
+  // The accessible name of this view.
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(TabbedPane);
 };
 
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 2047d40..8a735d0 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -12,6 +12,7 @@
 #include "base/win/windows_version.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ -441,10 +442,11 @@ void NativeTextfieldWin::InitializeAccessibilityInfo() {
     // We expect it to be a Label preceeding this view (if it exists).
     string16 name;
     View* label_view = parent->GetChildViewAt(label_index);
-    if (label_view->GetClassName() == Label::kViewClassName &&
-        label_view->GetAccessibleName(&name)) {
+    if (label_view->GetClassName() == Label::kViewClassName) {
+      ui::AccessibleViewState state;
+      label_view->GetAccessibleState(&state);
       hr = pAccPropServices->SetHwndPropStr(m_hWnd, OBJID_CLIENT,
-          CHILDID_SELF, PROPID_ACC_NAME, name.c_str());
+          CHILDID_SELF, PROPID_ACC_NAME, state.name.c_str());
     }
   }
 }
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index 2a72712..4366a0c 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -12,6 +12,7 @@
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/insets.h"
 #include "views/controls/native/native_view_host.h"
@@ -280,6 +281,10 @@ size_t Textfield::GetCursorPosition() const {
   return native_wrapper_ ? native_wrapper_->GetCursorPosition() : 0;
 }
 
+void Textfield::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, View overrides:
 
@@ -360,23 +365,14 @@ void Textfield::OnBlur() {
     native_wrapper_->HandleBlur();
 }
 
-AccessibilityTypes::Role Textfield::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_TEXT;
-}
-
-AccessibilityTypes::State Textfield::GetAccessibleState() {
-  int state = 0;
+void Textfield::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_TEXT;
+  state->name = accessible_name_;
   if (read_only())
-    state |= AccessibilityTypes::STATE_READONLY;
+    state->state |= ui::AccessibilityTypes::STATE_READONLY;
   if (IsPassword())
-    state |= AccessibilityTypes::STATE_PROTECTED;
-  return state;
-}
-
-string16 Textfield::GetAccessibleValue() {
-  if (!text_.empty())
-    return text_;
-  return string16();
+    state->state |= ui::AccessibilityTypes::STATE_PROTECTED;
+  state->value = text_;
 }
 
 void Textfield::SetEnabled(bool enabled) {
diff --git a/views/controls/textfield/textfield.h b/views/controls/textfield/textfield.h
index c8484d5..47285f7 100644
--- a/views/controls/textfield/textfield.h
+++ b/views/controls/textfield/textfield.h
@@ -247,6 +247,9 @@ class Textfield : public View {
   // only and has to be called after the wrapper is created.
   size_t GetCursorPosition() const;
 
+  // Set the accessible name of the text field.
+  void SetAccessibleName(const string16& name);
+
 #ifdef UNIT_TEST
   gfx::NativeView GetTestingHandle() const {
     return native_wrapper_ ? native_wrapper_->GetTestingHandle() : NULL;
@@ -269,9 +272,7 @@ class Textfield : public View {
   virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
-  virtual AccessibilityTypes::State GetAccessibleState() OVERRIDE;
-  virtual string16 GetAccessibleValue() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
@@ -339,6 +340,9 @@ class Textfield : public View {
   // Text to display when empty.
   string16 text_to_display_when_empty_;
 
+  // The accessible name of the text field.
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 3f6b8bf..4e8a53d 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -11,6 +11,7 @@
 #include "base/stl_util-inl.h"
 #include "base/win/win_util.h"
 #include "grit/app_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -60,12 +61,9 @@ TreeView::~TreeView() {
     ImageList_Destroy(image_list_);
 }
 
-AccessibilityTypes::Role TreeView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_OUTLINE;
-}
-
-AccessibilityTypes::State TreeView::GetAccessibleState() {
-  return AccessibilityTypes::STATE_READONLY;
+void TreeView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_OUTLINE;
+  state->state = ui::AccessibilityTypes::STATE_READONLY;
 }
 
 void TreeView::SetModel(TreeModel* model) {
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index d4d0771..a542e85 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -79,8 +79,7 @@ class TreeView : public NativeControl, ui::TreeModelObserver {
   }
 
   // Overridden from View:
-  virtual AccessibilityTypes::Role GetAccessibleRole();
-  virtual AccessibilityTypes::State GetAccessibleState();
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Edits the specified node. This cancels the current edit and expands
   // all parents of node.
diff --git a/views/test/test_views_delegate.h b/views/test/test_views_delegate.h
index cae1a64f..3d4f2e6 100644
--- a/views/test/test_views_delegate.h
+++ b/views/test/test_views_delegate.h
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/scoped_ptr.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "views/views_delegate.h"
 
@@ -16,7 +17,7 @@ class TestViewsDelegate : public views::ViewsDelegate {
   virtual ~TestViewsDelegate() {}
 
   // Overridden from views::ViewsDelegate:
-  virtual ui::Clipboard* GetClipboard() const {
+  virtual ui::Clipboard* GetClipboard() const OVERRIDE {
     if (!clipboard_.get()) {
       // Note that we need a MessageLoop for the next call to work.
       clipboard_.reset(new ui::Clipboard);
@@ -26,31 +27,32 @@ class TestViewsDelegate : public views::ViewsDelegate {
   virtual void SaveWindowPlacement(views::Window* window,
                                    const std::wstring& window_name,
                                    const gfx::Rect& bounds,
-                                   bool maximized) {
+                                   bool maximized) OVERRIDE {
   }
   virtual bool GetSavedWindowBounds(views::Window* window,
                                     const std::wstring& window_name,
-                                    gfx::Rect* bounds) const {
+                                    gfx::Rect* bounds) const OVERRIDE {
     return false;
   }
   virtual bool GetSavedMaximizedState(views::Window* window,
                                       const std::wstring& window_name,
-                                      bool* maximized) const {
+                                      bool* maximized) const OVERRIDE {
     return false;
   }
   virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type) {}
+      views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {}
+
 #if defined(OS_WIN)
-  virtual HICON GetDefaultWindowIcon() const {
+  virtual HICON GetDefaultWindowIcon() const OVERRIDE {
     return NULL;
   }
 #endif
-  virtual void AddRef() {}
-  virtual void ReleaseRef() {}
+
+  virtual void AddRef() OVERRIDE {}
+  virtual void ReleaseRef() OVERRIDE {}
 
  private:
   mutable scoped_ptr<ui::Clipboard> clipboard_;
 
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
-
diff --git a/views/view.cc b/views/view.cc
index bd778c645..dd511ab 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -11,6 +11,7 @@
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkRect.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/path.h"
@@ -26,7 +27,7 @@
 
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #endif
 #if defined(OS_LINUX)
 #include "ui/base/gtk/scoped_handle_gtk.h"
@@ -86,8 +87,8 @@ View::~View() {
   }
 
 #if defined(OS_WIN)
-  if (view_accessibility_.get())
-    view_accessibility_->set_view(NULL);
+  if (native_view_accessibility_win_.get())
+    native_view_accessibility_win_->set_view(NULL);
 #endif
 }
 
@@ -985,29 +986,6 @@ bool View::ExceededDragThreshold(int delta_x, int delta_y) {
           abs(delta_y) > GetVerticalDragThreshold());
 }
 
-// Accessibility ---------------------------------------------------------------
-
-void View::NotifyAccessibilityEvent(AccessibilityTypes::Event event_type) {
-  NotifyAccessibilityEvent(event_type, true);
-}
-
-bool View::GetAccessibleName(string16* name) {
-  DCHECK(name);
-
-  if (accessible_name_.empty())
-    return false;
-  *name = accessible_name_;
-  return true;
-}
-
-AccessibilityTypes::Role View::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_CLIENT;
-}
-
-void View::SetAccessibleName(const string16& name) {
-  accessible_name_ = name;
-}
-
 // Scrolling -------------------------------------------------------------------
 
 void View::ScrollRectToVisible(const gfx::Rect& rect) {
@@ -1136,7 +1114,8 @@ void View::OnFocus() {
   // TODO(beng): Investigate whether it's possible for us to move this to
   //             Focus().
   // Notify assistive technologies of the focus change.
-  NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
+  GetWidget()->NotifyAccessibilityEvent(
+      this, ui::AccessibilityTypes::EVENT_FOCUS, true);
 }
 
 void View::OnBlur() {
diff --git a/views/view.h b/views/view.h
index 83af008..f784c8e 100644
--- a/views/view.h
+++ b/views/view.h
@@ -20,13 +20,11 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "views/accelerator.h"
-#include "views/accessibility/accessibility_types.h"
 #include "views/background.h"
 #include "views/border.h"
 
 using ui::OSExchangeData;
 
-class ViewAccessibility;
 
 namespace gfx {
 class Canvas;
@@ -35,6 +33,7 @@ class Path;
 }
 
 namespace ui {
+struct AccessibleViewState;
 class ThemeProvider;
 class Transform;
 }
@@ -52,6 +51,10 @@ class ScrollView;
 class Widget;
 class Window;
 
+#if defined(OS_WIN)
+class NativeViewAccessibilityWin;
+#endif
+
 // ContextMenuController is responsible for showing the context menu for a
 // View. To use a ContextMenuController invoke SetContextMenuController on a
 // View. When the appropriate user gesture occurs ShowContextMenu is invoked
@@ -530,7 +533,7 @@ class View : public AcceleratorTarget {
   const Border* border() const { return border_.get(); }
 
   // Get the theme provider from the parent widget.
-  ThemeProvider* GetThemeProvider() const;
+  virtual ThemeProvider* GetThemeProvider() const;
 
   // RTL painting --------------------------------------------------------------
 
@@ -877,55 +880,15 @@ class View : public AcceleratorTarget {
   static bool ExceededDragThreshold(int delta_x, int delta_y);
 
   // Accessibility -------------------------------------------------------------
-  // TODO(ctguil): Move all this out to a AccessibleInfo wrapper class.
-
-  // Notify the platform specific accessibility client of changes in the user
-  // interface.  This will always raise native notifications.
-  virtual void NotifyAccessibilityEvent(AccessibilityTypes::Event event_type);
-
-  // Raise an accessibility notification with an option to also raise a native
-  // notification.
-  virtual void NotifyAccessibilityEvent(AccessibilityTypes::Event event_type,
-      bool send_native_event);
-
-  // Returns the MSAA default action of the current view. The string returned
-  // describes the default action that will occur when executing
-  // IAccessible::DoDefaultAction. For instance, default action of a button is
-  // 'Press'.
-  virtual string16 GetAccessibleDefaultAction() { return string16(); }
-
-  // Returns a string containing the mnemonic, or the keyboard shortcut, for a
-  // given control.
-  virtual string16 GetAccessibleKeyboardShortcut() {
-    return string16();
-  }
-
-  // Returns a brief, identifying string, containing a unique, readable name of
-  // a given control. Sets the input string appropriately, and returns true if
-  // successful.
-  bool GetAccessibleName(string16* name);
-
-  // Returns the accessibility role of the current view. The role is what
-  // assistive technologies (ATs) use to determine what behavior to expect from
-  // a given control.
-  virtual AccessibilityTypes::Role GetAccessibleRole();
 
-  // Returns the accessibility state of the current view.
-  virtual AccessibilityTypes::State GetAccessibleState() {
-    return 0;
-  }
-
-  // Returns the current value associated with a view.
-  virtual string16 GetAccessibleValue() { return string16(); }
-
-  // Assigns a string name to the given control. Needed as a View does not know
-  // which name will be associated with it until it is created to be a
-  // certain type.
-  void SetAccessibleName(const string16& name);
+  // Modifies |state| to reflect the current accessible state of this view.
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) { }
 
-  // Returns an instance of the (platform-specific) accessibility interface for
-  // the View.
-  ViewAccessibility* GetViewAccessibility();
+#if defined(OS_WIN)
+  // Returns an instance of the Windows-specific accessibility interface
+  // for this View.
+  NativeViewAccessibilityWin* GetNativeViewAccessibilityWin();
+#endif
 
   // Scrolling -----------------------------------------------------------------
   // TODO(beng): Figure out if this can live somewhere other than View, i.e.
@@ -1408,12 +1371,9 @@ class View : public AcceleratorTarget {
 
   // Accessibility -------------------------------------------------------------
 
-  // Name for this view, which can be retrieved by accessibility APIs.
-  string16 accessible_name_;
-
 #if defined(OS_WIN)
-  // The accessibility implementation for this View.
-  scoped_refptr<ViewAccessibility> view_accessibility_;
+  // The Windows-specific accessibility implementation for this View.
+  scoped_refptr<NativeViewAccessibilityWin> native_view_accessibility_win_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(View);
diff --git a/views/view_gtk.cc b/views/view_gtk.cc
index b666338..5155099 100644
--- a/views/view_gtk.cc
+++ b/views/view_gtk.cc
@@ -7,25 +7,9 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
-#include "views/views_delegate.h"
 
 namespace views {
 
-void View::NotifyAccessibilityEvent(AccessibilityTypes::Event event_type,
-    bool send_native_event) {
-  // Send the notification to the delegate.
-  if (ViewsDelegate::views_delegate)
-    ViewsDelegate::views_delegate->NotifyAccessibilityEvent(this, event_type);
-
-  // In the future if we add native GTK accessibility support, the
-  // notification should be sent here.
-}
-
-ViewAccessibility* View::GetViewAccessibility() {
-  NOTIMPLEMENTED();
-  return NULL;
-}
-
 int View::GetHorizontalDragThreshold() {
   static bool determined_threshold = false;
   static int drag_threshold = 8;
diff --git a/views/view_win.cc b/views/view_win.cc
index 2c213c2..011b319 100644
--- a/views/view_win.cc
+++ b/views/view_win.cc
@@ -13,7 +13,7 @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #include "views/border.h"
 #include "views/views_delegate.h"
 #include "views/widget/root_view.h"
@@ -22,28 +22,11 @@
 
 namespace views {
 
-void View::NotifyAccessibilityEvent(AccessibilityTypes::Event event_type,
-    bool send_native_event) {
-  // Send the notification to the delegate.
-  if (ViewsDelegate::views_delegate)
-    ViewsDelegate::views_delegate->NotifyAccessibilityEvent(this, event_type);
-
-  // Now call the Windows-specific method to notify MSAA clients of this
-  // event.  The widget gives us a temporary unique child ID to associate
-  // with this view so that clients can call get_accChild in ViewAccessibility
-  // to retrieve the IAccessible associated with this view.
-  if (send_native_event) {
-    WidgetWin* view_widget = static_cast<WidgetWin*>(GetWidget());
-    int child_id = view_widget->AddAccessibilityViewEvent(this);
-    ::NotifyWinEvent(ViewAccessibility::MSAAEvent(event_type),
-        view_widget->GetNativeView(), OBJID_CLIENT, child_id);
-  }
-}
-
-ViewAccessibility* View::GetViewAccessibility() {
-  if (!view_accessibility_.get())
-    view_accessibility_.swap(ViewAccessibility::Create(this));
-  return view_accessibility_.get();
+NativeViewAccessibilityWin* View::GetNativeViewAccessibilityWin() {
+  if (!native_view_accessibility_win_.get())
+    native_view_accessibility_win_.swap(
+        NativeViewAccessibilityWin::Create(this));
+  return native_view_accessibility_win_.get();
 }
 
 int View::GetHorizontalDragThreshold() {
diff --git a/views/views.gyp b/views/views.gyp
index f8b145c..41f70c5 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -74,9 +74,8 @@
         # All .cc, .h under views, except unittests
         'accelerator.cc',
         'accelerator.h',
-        'accessibility/accessibility_types.h',
-        'accessibility/view_accessibility.cc',
-        'accessibility/view_accessibility.h',
+        'accessibility/native_view_accessibility_win.cc',
+        'accessibility/native_view_accessibility_win.h',
         'animation/bounds_animator.cc',
         'animation/bounds_animator.h',
         'background.cc',
@@ -389,9 +388,7 @@
             '../build/linux/system.gyp:xext',
           ],
           'sources!': [
-            'accessibility/accessible_wrapper.cc',
-            'accessibility/view_accessibility.cc',
-            'accessibility/view_accessibility_wrapper.cc',
+            'accessibility/native_view_accessibility_win.cc',
             'controls/scrollbar/bitmap_scroll_bar.cc',
             'controls/combo_box.cc',
             'controls/hwnd_view.cc',
diff --git a/views/views_delegate.h b/views/views_delegate.h
index 98b734e..d7411f6 100644
--- a/views/views_delegate.h
+++ b/views/views_delegate.h
@@ -11,7 +11,7 @@
 #include <windows.h>
 #endif
 
-#include "views/accessibility/accessibility_types.h"
+#include "ui/base/accessibility/accessibility_types.h"
 
 namespace gfx {
 class Rect;
@@ -58,10 +58,8 @@ class ViewsDelegate {
                                       const std::wstring& window_name,
                                       bool* maximized) const = 0;
 
-  // Notify the delegate that an accessibility event has happened in
-  // a particular view.
   virtual void NotifyAccessibilityEvent(
-      views::View* view, AccessibilityTypes::Event event_type) = 0;
+      views::View* view, ui::AccessibilityTypes::Event event_type) = 0;
 
 #if defined(OS_WIN)
   // Retrieves the default window icon to use for windows if none is specified.
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index 9d4bbc3..65e4002 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -8,6 +8,7 @@
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas_skia.h"
@@ -419,8 +420,8 @@ std::string RootView::GetClassName() const {
   return kViewClassName;
 }
 
-AccessibilityTypes::Role RootView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_APPLICATION;
+void RootView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_APPLICATION;
 }
 
 void RootView::OnPaint(gfx::Canvas* canvas) {
diff --git a/views/widget/root_view.h b/views/widget/root_view.h
index e6d5bcb..d9634b2 100644
--- a/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -117,7 +117,7 @@ class RootView : public View,
 #endif
   virtual bool IsVisibleInRootView() const OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
-  virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   // Overridden from View:
diff --git a/views/widget/widget.h b/views/widget/widget.h
index a9eb040..46a37d7 100644
--- a/views/widget/widget.h
+++ b/views/widget/widget.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/native_widget_delegate.h"
@@ -240,6 +241,17 @@ class Widget : public internal::NativeWidgetDelegate,
   void SetFocusTraversableParent(FocusTraversable* parent);
   void SetFocusTraversableParentView(View* parent_view);
 
+  // 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.
+  virtual void NotifyAccessibilityEvent(
+      View* view,
+      ui::AccessibilityTypes::Event event_type,
+      bool send_native_event) = 0;
+
   NativeWidget* native_widget() { return native_widget_; }
 
   // Overridden from FocusTraversable:
diff --git a/views/widget/widget_gtk.cc b/views/widget/widget_gtk.cc
index 0ae89cb..dfa1b2e 100644
--- a/views/widget/widget_gtk.cc
+++ b/views/widget/widget_gtk.cc
@@ -21,6 +21,7 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/path.h"
+#include "views/views_delegate.h"
 #include "views/focus/view_storage.h"
 #include "views/widget/drop_target_gtk.h"
 #include "views/widget/gtk_views_fixed.h"
@@ -779,6 +780,18 @@ void WidgetGtk::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   }
 }
 
+void WidgetGtk::NotifyAccessibilityEvent(
+    View* view,
+    ui::AccessibilityTypes::Event event_type,
+    bool send_native_event) {
+  // Send the notification to the delegate.
+  if (ViewsDelegate::views_delegate)
+    ViewsDelegate::views_delegate->NotifyAccessibilityEvent(view, event_type);
+
+  // In the future if we add native GTK accessibility support, the
+  // notification should be sent here.
+}
+
 void WidgetGtk::ClearNativeFocus() {
   DCHECK(type_ != TYPE_CHILD);
   if (!GetNativeView()) {
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index 9facf90..a9a7034 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -173,6 +173,10 @@ class WidgetGtk : public Widget,
   virtual FocusManager* GetFocusManager();
   virtual void ViewHierarchyChanged(bool is_add, View *parent,
                                     View *child);
+  virtual void NotifyAccessibilityEvent(
+      View* view,
+      ui::AccessibilityTypes::Event event_type,
+      bool send_native_event);
 
   // Clears the focus on the native widget having the focus.
   virtual void ClearNativeFocus();
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index e81d5c2..cabe472 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -21,7 +21,7 @@
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/native_theme_win.h"
 #include "ui/gfx/path.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #include "views/controls/native_control_win.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/focus/focus_util_win.h"
@@ -507,6 +507,26 @@ void WidgetWin::SetCursor(gfx::NativeCursor cursor) {
   }
 }
 
+void WidgetWin::NotifyAccessibilityEvent(
+    View* view,
+    ui::AccessibilityTypes::Event event_type,
+    bool send_native_event) {
+  // Send the notification to the delegate.
+  if (ViewsDelegate::views_delegate)
+    ViewsDelegate::views_delegate->NotifyAccessibilityEvent(view, event_type);
+
+  // Now call the Windows-specific method to notify MSAA clients of this
+  // event.  The widget gives us a temporary unique child ID to associate
+  // with this view so that clients can call get_accChild in
+  // NativeViewAccessibilityWin to retrieve the IAccessible associated
+  // with this view.
+  if (send_native_event) {
+    int child_id = AddAccessibilityViewEvent(view);
+    ::NotifyWinEvent(NativeViewAccessibilityWin::MSAAEvent(event_type),
+                     GetNativeView(), OBJID_CLIENT, child_id);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WidgetWin, MessageLoop::Observer implementation:
 
@@ -649,7 +669,7 @@ LRESULT WidgetWin::OnGetObject(UINT uMsg, WPARAM w_param, LPARAM l_param) {
   if (OBJID_CLIENT == l_param) {
     // Retrieve MSAA dispatch object for the root view.
     base::win::ScopedComPtr<IAccessible> root(
-        ViewAccessibility::GetAccessibleForView(GetRootView()));
+        NativeViewAccessibilityWin::GetAccessibleForView(GetRootView()));
 
     // Create a reference that MSAA will marshall to the client.
     reference_result = LresultFromObject(IID_IAccessible, w_param,
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index 72414be..add96c1 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -106,8 +106,9 @@ class WidgetWin : public ui::WindowImpl,
   }
 
   // Obtain the view event with the given MSAA child id.  Used in
-  // ViewAccessibility::get_accChild to support requests for children of
-  // windowless controls.  May return NULL (see ViewHierarchyChanged).
+  // NativeViewAccessibilityWin::get_accChild to support requests for
+  // children of windowless controls.  May return NULL
+  // (see ViewHierarchyChanged).
   View* GetAccessibilityViewEventAt(int id);
 
   // Add a view that has recently fired an accessibility event.  Returns a MSAA
@@ -145,6 +146,10 @@ class WidgetWin : public ui::WindowImpl,
   virtual FocusManager* GetFocusManager();
   virtual void ViewHierarchyChanged(bool is_add, View *parent,
                                     View *child);
+  virtual void NotifyAccessibilityEvent(
+      View* view,
+      ui::AccessibilityTypes::Event event_type,
+      bool send_native_event);
 
   BOOL IsWindow() const {
     return ::IsWindow(GetNativeView());
diff --git a/views/window/client_view.cc b/views/window/client_view.cc
index de198ed..92dd06d 100644
--- a/views/window/client_view.cc
+++ b/views/window/client_view.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
@@ -62,8 +63,8 @@ void ClientView::OnBoundsChanged() {
   // NonClientView::Layout.
 }
 
-AccessibilityTypes::Role ClientView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_CLIENT;
+void ClientView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_CLIENT;
 }
 
 }  // namespace views
diff --git a/views/window/client_view.h b/views/window/client_view.h
index 08ddcd4..6dd39fe 100644
--- a/views/window/client_view.h
+++ b/views/window/client_view.h
@@ -60,9 +60,10 @@ class ClientView : public View {
 
  protected:
   // Overridden from View:
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
-  virtual void OnBoundsChanged();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
+      OVERRIDE;
+  virtual void OnBoundsChanged() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Accessors for private data members.
   Window* window() const { return window_; }
diff --git a/views/window/dialog_delegate.h b/views/window/dialog_delegate.h
index ac6d4e9..36090ca 100644
--- a/views/window/dialog_delegate.h
+++ b/views/window/dialog_delegate.h
@@ -6,8 +6,8 @@
 #define VIEWS_WINDOW_DIALOG_DELEGATE_H_
 #pragma once
 
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/message_box_flags.h"
-#include "views/accessibility/accessibility_types.h"
 #include "views/window/dialog_client_view.h"
 #include "views/window/window_delegate.h"
 
@@ -122,10 +122,10 @@ class DialogDelegate : public WindowDelegate {
   // delegate's Window.
   DialogClientView* GetDialogClientView() const;
 
- private:
+ protected:
   // Overridden from WindowDelegate:
-  AccessibilityTypes::Role accessible_role() const {
-    return AccessibilityTypes::ROLE_DIALOG;
+  virtual ui::AccessibilityTypes::Role GetAccessibleRole() const {
+    return ui::AccessibilityTypes::ROLE_DIALOG;
   }
 };
 
diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index 210bd10..bb09fa3 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -4,6 +4,7 @@
 
 #include "views/window/non_client_view.h"
 
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
@@ -121,6 +122,10 @@ void NonClientView::LayoutFrameView() {
   frame_view_->Layout();
 }
 
+void NonClientView::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientView, View overrides:
 
@@ -174,8 +179,9 @@ views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) {
   return View::GetEventHandlerForPoint(point);
 }
 
-AccessibilityTypes::Role NonClientView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_WINDOW;
+void NonClientView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_WINDOW;
+  state->name = accessible_name_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -248,8 +254,8 @@ bool NonClientFrameView::ShouldPaintAsActive() const {
   return GetWindow()->IsActive() || paint_as_active_;
 }
 
-AccessibilityTypes::Role NonClientFrameView::GetAccessibleRole() {
-  return AccessibilityTypes::ROLE_WINDOW;
+void NonClientFrameView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 }  // namespace views
diff --git a/views/window/non_client_view.h b/views/window/non_client_view.h
index db1daff..10c652c 100644
--- a/views/window/non_client_view.h
+++ b/views/window/non_client_view.h
@@ -69,8 +69,8 @@ class NonClientFrameView : public View {
   virtual void ResetWindowControls() = 0;
 
   // Overridden from View:
-  virtual bool HitTest(const gfx::Point& l) const;
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   virtual void OnBoundsChanged();
@@ -205,16 +205,21 @@ class NonClientView : public View {
   // of a window resize message.
   void LayoutFrameView();
 
+  // Set the accessible name of this view.
+  void SetAccessibleName(const string16& name);
+
   // NonClientView, View overrides:
-  virtual gfx::Size GetPreferredSize();
-  virtual gfx::Size GetMinimumSize();
-  virtual void Layout();
-  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual gfx::Size GetMinimumSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   // NonClientView, View overrides:
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
-  virtual views::View* GetEventHandlerForPoint(const gfx::Point& point);
+  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child)
+      OVERRIDE;
+  virtual views::View* GetEventHandlerForPoint(const gfx::Point& point)
+      OVERRIDE;
 
  private:
   // The frame that hosts this NonClientView.
@@ -230,6 +235,9 @@ class NonClientView : public View {
   // dynamically as the system settings change.
   scoped_ptr<NonClientFrameView> frame_view_;
 
+  // The accessible name of this view.
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(NonClientView);
 };
 
diff --git a/views/window/window_delegate.h b/views/window/window_delegate.h
index 04ac6b3..6ef75cc 100644
--- a/views/window/window_delegate.h
+++ b/views/window/window_delegate.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/scoped_ptr.h"
-#include "views/accessibility/accessibility_types.h"
+#include "ui/base/accessibility/accessibility_types.h"
 
 class SkBitmap;
 
@@ -56,11 +56,11 @@ class WindowDelegate {
     return false;
   }
 
-  virtual AccessibilityTypes::Role accessible_role() const {
-    return AccessibilityTypes::ROLE_WINDOW;
+  virtual ui::AccessibilityTypes::Role GetAccessibleRole() const {
+    return ui::AccessibilityTypes::ROLE_WINDOW;
   }
 
-  virtual AccessibilityTypes::State accessible_state() const {
+  virtual ui::AccessibilityTypes::State GetAccessibleState() const {
     return 0;
   }
 
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 7776bea..49c9b2a 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -11,6 +11,7 @@
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
+#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/theme_provider.h"
@@ -19,7 +20,7 @@
 #include "ui/gfx/font.h"
 #include "ui/gfx/icon_util.h"
 #include "ui/gfx/path.h"
-#include "views/accessibility/view_accessibility.h"
+#include "views/accessibility/native_view_accessibility_win.h"
 #include "views/widget/root_view.h"
 #include "views/window/client_view.h"
 #include "views/window/custom_frame_view.h"
@@ -1448,10 +1449,10 @@ void WindowWin::UpdateAccessibleRole() {
     IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
   if (SUCCEEDED(hr)) {
     VARIANT var;
-    AccessibilityTypes::Role role = window_delegate_->accessible_role();
+    ui::AccessibilityTypes::Role role = window_delegate_->GetAccessibleRole();
     if (role) {
       var.vt = VT_I4;
-      var.lVal = ViewAccessibility::MSAARole(role);
+      var.lVal = NativeViewAccessibilityWin::MSAARole(role);
       hr = pAccPropServices->SetHwndProp(GetNativeView(), OBJID_CLIENT,
         CHILDID_SELF, PROPID_ACC_ROLE, var);
     }
@@ -1464,9 +1465,10 @@ void WindowWin::UpdateAccessibleState() {
     IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
   if (SUCCEEDED(hr)) {
     VARIANT var;
-    AccessibilityTypes::State state = window_delegate_->accessible_state();
+    ui::AccessibilityTypes::State state =
+        window_delegate_->GetAccessibleState();
     if (state) {
-      var.lVal = ViewAccessibility::MSAAState(state);
+      var.lVal = NativeViewAccessibilityWin::MSAAState(state);
       hr = pAccPropServices->SetHwndProp(GetNativeView(), OBJID_CLIENT,
         CHILDID_SELF, PROPID_ACC_STATE, var);
     }