Some cleanup of view accessibility and view accessibility wrapper.

1. Remove the ViewAccessibilityWrapper class. The view can directly manage it's ViewAccessibility.
2. Always use GetAccessibleForView to retrieve a view's associated accessibility object. This ensures that the correct accessibility object is returned for native view host objects.
3. Update get_accFocus to use FocusManager.
4. Move oleacc guid definitions to view_win.cc.

BUG=none
TEST=interactive_ui_tests:BrowserViewsAccessibilityTest.TestBrowserRootViewAccObj
TEST=Manual: I can select the accessibility object of a native view host within AccExplorer32.exe.

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

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

1 files changed, 5 insertions, 6 deletions

diff --git a/views/view.h b/views/view.h
index dbff72b..ce9fcea 100644
--- a/views/view.h
+++ b/views/view.h
@@ -30,8 +30,8 @@ class Insets;
 class Path;
 }
 
-class ViewAccessibilityWrapper;
 class ThemeProvider;
+class ViewAccessibility;
 
 namespace views {
 
@@ -601,10 +601,9 @@ class View : public AcceleratorTarget {
   // certain type.
   void SetAccessibleName(const std::wstring& name);
 
-  // Returns an instance of a wrapper class implementing the (platform-specific)
-  // accessibility interface for a given View. If one exists, it will be
-  // re-used, otherwise a new instance will be created.
-  ViewAccessibilityWrapper* GetViewAccessibilityWrapper();
+  // Returns an instance of the (platform-specific) accessibility interface for
+  // the View.
+  ViewAccessibility* GetViewAccessibility();
 
   // Utility functions
 
@@ -1316,7 +1315,7 @@ class View : public AcceleratorTarget {
 
 #if defined(OS_WIN)
   // The accessibility implementation for this View.
-  scoped_ptr<ViewAccessibilityWrapper> accessibility_;
+  scoped_refptr<ViewAccessibility> view_accessibility_;
 #endif
 
   DragController* drag_controller_;