summaryrefslogtreecommitdiffstats
path: root/views/view.h
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 22:25:25 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 22:25:25 +0000
commitce3c9bf8016bf2fd11bd41e388764d9f4724e5ef (patch)
treed0e046745460465d1d06ca28e60fc6cf90ef37f1 /views/view.h
parent69e7ecec96febc8fb52c87206028f2ee2cc2b2e8 (diff)
downloadchromium_src-ce3c9bf8016bf2fd11bd41e388764d9f4724e5ef.zip
chromium_src-ce3c9bf8016bf2fd11bd41e388764d9f4724e5ef.tar.gz
chromium_src-ce3c9bf8016bf2fd11bd41e388764d9f4724e5ef.tar.bz2
Make the web content accessibility tree a descendant of the main window's
accessibility tree again, which makes it possible to debug Chrome accessibility on Windows using tools like AccExplorer32 or AccProbe. This change refactors the code that retrieves the Windows IAccessible interface from a View that wraps a native HWND. The previous code was brittle, using ViewProps and hardcoded View classname tests. This change moves that logic directly to the classes that wrap native views. BUG=54220 BUG=85673 TEST=Updated AccessibilityWinBrowserTest.ContainsRendererAccessibilityTree Review URL: http://codereview.chromium.org/6995126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.h')
-rw-r--r--views/view.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/views/view.h b/views/view.h
index 618c53d..cd90af9f 100644
--- a/views/view.h
+++ b/views/view.h
@@ -172,10 +172,6 @@ class View : public AcceleratorTarget {
// Returns whether the view is hot-tracked.
virtual bool IsHotTracked() const;
- // FATE TBD ------------------------------------------------------------------
- // TODO(beng): Figure out what these methods are for and delete them.
- virtual Widget* GetChildWidget();
-
// Creation and lifetime -----------------------------------------------------
View();
@@ -872,11 +868,8 @@ class View : public AcceleratorTarget {
// Modifies |state| to reflect the current accessible state of this view.
virtual void GetAccessibleState(ui::AccessibleViewState* state) { }
-#if defined(OS_WIN)
- // Returns an instance of the Windows-specific accessibility interface
- // for this View.
- NativeViewAccessibilityWin* GetNativeViewAccessibilityWin();
-#endif
+ // Returns an instance of the native accessibility interface for this view.
+ virtual gfx::NativeViewAccessible GetNativeViewAccessible();
// Scrolling -----------------------------------------------------------------
// TODO(beng): Figure out if this can live somewhere other than View, i.e.
@@ -1428,8 +1421,8 @@ class View : public AcceleratorTarget {
// Accessibility -------------------------------------------------------------
+ // The Windows-specific accessibility implementation for this view.
#if defined(OS_WIN)
- // The Windows-specific accessibility implementation for this View.
scoped_refptr<NativeViewAccessibilityWin> native_view_accessibility_win_;
#endif