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

Side by Side Diff: ui/views/accessibility/native_view_accessibility_win.h

Issue 343653005: Fix IAccessible2 interface in views accessibility. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nvda_fix_2
Patch Set: Fix all COM_INTERFACE macros Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ 5 #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
6 #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ 6 #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <oleacc.h> 10 #include <oleacc.h>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public IDispatchImpl<IAccessible2_2, &IID_IAccessible2_2, 42 public IDispatchImpl<IAccessible2_2, &IID_IAccessible2_2,
43 &LIBID_IAccessible2Lib>, 43 &LIBID_IAccessible2Lib>,
44 public IAccessibleText, 44 public IAccessibleText,
45 public IServiceProvider, 45 public IServiceProvider,
46 public IAccessibleEx, 46 public IAccessibleEx,
47 public IRawElementProviderSimple, 47 public IRawElementProviderSimple,
48 public NativeViewAccessibility { 48 public NativeViewAccessibility {
49 public: 49 public:
50 BEGIN_COM_MAP(NativeViewAccessibilityWin) 50 BEGIN_COM_MAP(NativeViewAccessibilityWin)
51 COM_INTERFACE_ENTRY2(IDispatch, IAccessible2_2) 51 COM_INTERFACE_ENTRY2(IDispatch, IAccessible2_2)
52 COM_INTERFACE_ENTRY2(IAccessible, IAccessible2_2) 52 COM_INTERFACE_ENTRY(IAccessible)
53 COM_INTERFACE_ENTRY(IAccessible2)
53 COM_INTERFACE_ENTRY(IAccessible2_2) 54 COM_INTERFACE_ENTRY(IAccessible2_2)
55 COM_INTERFACE_ENTRY(IAccessibleEx)
54 COM_INTERFACE_ENTRY(IAccessibleText) 56 COM_INTERFACE_ENTRY(IAccessibleText)
57 COM_INTERFACE_ENTRY(IRawElementProviderSimple)
55 COM_INTERFACE_ENTRY(IServiceProvider) 58 COM_INTERFACE_ENTRY(IServiceProvider)
56 COM_INTERFACE_ENTRY(IAccessibleEx)
57 COM_INTERFACE_ENTRY(IRawElementProviderSimple)
58 END_COM_MAP() 59 END_COM_MAP()
59 60
60 virtual ~NativeViewAccessibilityWin(); 61 virtual ~NativeViewAccessibilityWin();
61 62
62 // NativeViewAccessibility. 63 // NativeViewAccessibility.
63 virtual void NotifyAccessibilityEvent( 64 virtual void NotifyAccessibilityEvent(
64 ui::AXEvent event_type) OVERRIDE; 65 ui::AXEvent event_type) OVERRIDE;
65 virtual gfx::NativeViewAccessible GetNativeObject() OVERRIDE; 66 virtual gfx::NativeViewAccessible GetNativeObject() OVERRIDE;
66 virtual void Destroy() OVERRIDE; 67 virtual void Destroy() OVERRIDE;
67 68
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 // an alert event, in order to provide an api to quickly identify all 442 // an alert event, in order to provide an api to quickly identify all
442 // open alerts. 443 // open alerts.
443 static std::vector<int> alert_target_view_storage_ids_; 444 static std::vector<int> alert_target_view_storage_ids_;
444 445
445 DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin); 446 DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin);
446 }; 447 };
447 448
448 } // namespace views 449 } // namespace views
449 450
450 #endif // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_ 451 #endif // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698