OLD | NEW |
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 #include "ui/views/accessibility/native_view_accessibility_win.h" | 5 #include "ui/views/accessibility/native_view_accessibility_win.h" |
6 | 6 |
7 #include <oleacc.h> | 7 #include <oleacc.h> |
8 #include <UIAutomationClient.h> | 8 #include <UIAutomationClient.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "ui/base/win/atl_module.h" | 23 #include "ui/base/win/atl_module.h" |
24 #include "ui/views/controls/button/custom_button.h" | 24 #include "ui/views/controls/button/custom_button.h" |
25 #include "ui/views/focus/focus_manager.h" | 25 #include "ui/views/focus/focus_manager.h" |
26 #include "ui/views/focus/view_storage.h" | 26 #include "ui/views/focus/view_storage.h" |
27 #include "ui/views/widget/widget.h" | 27 #include "ui/views/widget/widget.h" |
28 #include "ui/views/win/hwnd_util.h" | 28 #include "ui/views/win/hwnd_util.h" |
29 | 29 |
30 namespace views { | 30 namespace views { |
31 namespace { | 31 namespace { |
32 | 32 |
| 33 // A version of the OBJID_CLIENT constant that works in 64-bit mode too. |
| 34 static const LPARAM kObjIdClient = static_cast<ULONG>(OBJID_CLIENT); |
| 35 |
33 class AccessibleWebViewRegistry { | 36 class AccessibleWebViewRegistry { |
34 public: | 37 public: |
35 static AccessibleWebViewRegistry* GetInstance(); | 38 static AccessibleWebViewRegistry* GetInstance(); |
36 | 39 |
37 void RegisterWebView(View* web_view); | 40 void RegisterWebView(View* web_view); |
38 | 41 |
39 void UnregisterWebView(View* web_view); | 42 void UnregisterWebView(View* web_view); |
40 | 43 |
41 // Given the view that received the request for the accessible | 44 // Given the view that received the request for the accessible |
42 // id in |top_view|, and the child id requested, return the native | 45 // id in |top_view|, and the child id requested, return the native |
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
780 return E_NOTIMPL; | 783 return E_NOTIMPL; |
781 } | 784 } |
782 | 785 |
783 STDMETHODIMP NativeViewAccessibilityWin::accSelect( | 786 STDMETHODIMP NativeViewAccessibilityWin::accSelect( |
784 LONG flagsSelect, VARIANT var_id) { | 787 LONG flagsSelect, VARIANT var_id) { |
785 return E_NOTIMPL; | 788 return E_NOTIMPL; |
786 } | 789 } |
787 | 790 |
788 STDMETHODIMP NativeViewAccessibilityWin::get_accHelp( | 791 STDMETHODIMP NativeViewAccessibilityWin::get_accHelp( |
789 VARIANT var_id, BSTR* help) { | 792 VARIANT var_id, BSTR* help) { |
790 if (help) | 793 base::string16 temp = base::UTF8ToUTF16(view_->GetClassName()); |
791 *help = NULL; | 794 *help = SysAllocString(temp.c_str()); |
792 return E_NOTIMPL; | 795 return S_OK; |
793 } | 796 } |
794 | 797 |
795 STDMETHODIMP NativeViewAccessibilityWin::get_accHelpTopic( | 798 STDMETHODIMP NativeViewAccessibilityWin::get_accHelpTopic( |
796 BSTR* help_file, VARIANT var_id, LONG* topic_id) { | 799 BSTR* help_file, VARIANT var_id, LONG* topic_id) { |
797 if (help_file) { | 800 if (help_file) { |
798 *help_file = NULL; | 801 *help_file = NULL; |
799 } | 802 } |
800 if (topic_id) { | 803 if (topic_id) { |
801 *topic_id = static_cast<LONG>(-1); | 804 *topic_id = static_cast<LONG>(-1); |
802 } | 805 } |
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1494 if (view == NULL || view == view_) { | 1497 if (view == NULL || view == view_) { |
1495 alert_target_view_storage_ids_.erase( | 1498 alert_target_view_storage_ids_.erase( |
1496 alert_target_view_storage_ids_.begin() + i); | 1499 alert_target_view_storage_ids_.begin() + i); |
1497 } else { | 1500 } else { |
1498 ++i; | 1501 ++i; |
1499 } | 1502 } |
1500 } | 1503 } |
1501 } | 1504 } |
1502 | 1505 |
1503 } // namespace views | 1506 } // namespace views |
OLD | NEW |