OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include <atlbase.h> | 5 #include <atlbase.h> |
6 #include <atlcom.h> | 6 #include <atlcom.h> |
7 | 7 |
8 #include "views/accessibility/native_view_accessibility_win.h" | 8 #include "views/accessibility/native_view_accessibility_win.h" |
9 | 9 |
| 10 #include "base/win/atl_module.h" |
10 #include "third_party/iaccessible2/ia2_api_all.h" | 11 #include "third_party/iaccessible2/ia2_api_all.h" |
11 #include "ui/base/accessibility/accessible_view_state.h" | 12 #include "ui/base/accessibility/accessible_view_state.h" |
12 #include "ui/base/view_prop.h" | 13 #include "ui/base/view_prop.h" |
13 #include "views/widget/native_widget_win.h" | 14 #include "views/widget/native_widget_win.h" |
14 #include "views/widget/widget.h" | 15 #include "views/widget/widget.h" |
15 | 16 |
16 using ui::AccessibilityTypes; | 17 using ui::AccessibilityTypes; |
17 | 18 |
18 // static | 19 // static |
19 long NativeViewAccessibilityWin::next_unique_id_ = 1; | 20 long NativeViewAccessibilityWin::next_unique_id_ = 1; |
20 | 21 |
21 // static | 22 // static |
22 scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create( | 23 scoped_refptr<NativeViewAccessibilityWin> NativeViewAccessibilityWin::Create( |
23 views::View* view) { | 24 views::View* view) { |
| 25 base::win::CreateATLModuleIfNeeded(); |
24 CComObject<NativeViewAccessibilityWin>* instance = NULL; | 26 CComObject<NativeViewAccessibilityWin>* instance = NULL; |
25 HRESULT hr = CComObject<NativeViewAccessibilityWin>::CreateInstance( | 27 HRESULT hr = CComObject<NativeViewAccessibilityWin>::CreateInstance( |
26 &instance); | 28 &instance); |
27 DCHECK(SUCCEEDED(hr)); | 29 DCHECK(SUCCEEDED(hr)); |
28 instance->set_view(view); | 30 instance->set_view(view); |
29 return scoped_refptr<NativeViewAccessibilityWin>(instance); | 31 return scoped_refptr<NativeViewAccessibilityWin>(instance); |
30 } | 32 } |
31 | 33 |
32 NativeViewAccessibilityWin::NativeViewAccessibilityWin() | 34 NativeViewAccessibilityWin::NativeViewAccessibilityWin() |
33 : view_(NULL), | 35 : view_(NULL), |
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
906 } | 908 } |
907 | 909 |
908 string16 NativeViewAccessibilityWin::TextForIAccessibleText() { | 910 string16 NativeViewAccessibilityWin::TextForIAccessibleText() { |
909 ui::AccessibleViewState state; | 911 ui::AccessibleViewState state; |
910 view_->GetAccessibleState(&state); | 912 view_->GetAccessibleState(&state); |
911 if (state.role == AccessibilityTypes::ROLE_TEXT) | 913 if (state.role == AccessibilityTypes::ROLE_TEXT) |
912 return state.value; | 914 return state.value; |
913 else | 915 else |
914 return state.name; | 916 return state.name; |
915 } | 917 } |
OLD | NEW |