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
diff --git a/views/view.cc b/views/view.cc
index 739fd6ce..8235f2595 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -26,7 +26,7 @@
#include "views/window/window.h"
#if defined(OS_WIN)
-#include "views/accessibility/view_accessibility_wrapper.h"
+#include "views/accessibility/view_accessibility.h"
#endif
#if defined(OS_LINUX)
#include "app/scoped_handle_gtk.h"
@@ -68,9 +68,6 @@
accelerator_focus_manager_(NULL),
registered_accelerator_count_(0),
context_menu_controller_(NULL),
-#if defined(OS_WIN)
- accessibility_(NULL),
-#endif
drag_controller_(NULL),
flip_canvas_on_paint_for_rtl_ui_(false) {
}
@@ -87,8 +84,8 @@
}
#if defined(OS_WIN)
- if (accessibility_.get())
- accessibility_->Uninitialize();
+ if (view_accessibility_.get())
+ view_accessibility_->set_view(NULL);
#endif
}
