Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: ui/views/accessibility/native_view_accessibility.h

Issue 909143003: Re-land: Implement NativeViewAccessibilityWin using AXPlatformNodeWin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/accessibility/native_view_accessibility.h
diff --git a/ui/views/accessibility/native_view_accessibility.h b/ui/views/accessibility/native_view_accessibility.h
index 9a94d3a14d1ea84afc389eddb813aea97dc475e7..63d2f0dca80259172dd68086c9b0955fd5ded1df 100644
--- a/ui/views/accessibility/native_view_accessibility.h
+++ b/ui/views/accessibility/native_view_accessibility.h
@@ -14,41 +14,42 @@
namespace views {
class View;
+class Widget;
class VIEWS_EXPORT NativeViewAccessibility : public ui::AXPlatformNodeDelegate {
public:
static NativeViewAccessibility* Create(View* view);
- virtual gfx::NativeViewAccessible GetNativeObject();
+ gfx::NativeViewAccessible GetNativeObject();
// Call Destroy rather than deleting this, because the subclass may
// use reference counting.
virtual void Destroy();
- // WebViews need to be registered because they implement their own
- // tree of accessibility objects, and we need to check them when
- // mapping a child id to a NativeViewAccessible.
- static void RegisterWebView(View* web_view);
- static void UnregisterWebView(View* web_view);
+ void NotifyAccessibilityEvent(ui::AXEvent event_type);
// ui::AXPlatformNodeDelegate
- ui::AXNodeData* GetData() override;
+ const ui::AXNodeData* GetData() override;
int GetChildCount() override;
gfx::NativeViewAccessible ChildAtIndex(int index) override;
gfx::NativeViewAccessible GetParent() override;
+ int GetIndexInParent() override;
gfx::Vector2d GetGlobalCoordinateOffset() override;
- void NotifyAccessibilityEvent(ui::AXEvent event_type) override;
+ gfx::NativeViewAccessible HitTestSync(int x, int y) override;
+ gfx::NativeViewAccessible GetFocus() override;
+ gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
+ void DoDefaultAction() override;
+ bool SetStringValue(const base::string16& new_value) override;
protected:
- NativeViewAccessibility();
+ NativeViewAccessibility(View* view);
virtual ~NativeViewAccessibility();
- void set_view(views::View* view) { view_ = view; }
- const View* view() const { return view_; }
-
View* view_; // Weak. Owns this.
private:
+ void PopulateChildWidgetVector(std::vector<Widget*>* result_child_widgets);
+
// We own this, but it is reference-counted on some platforms so we can't use
// a scoped_ptr. It is dereferenced in the destructor.
ui::AXPlatformNode* ax_node_;

Powered by Google App Engine
This is Rietveld 408576698