OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/render_widget_host_view_win.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_win.h" |
6 | 6 |
7 #include "app/gfx/canvas.h" | 7 #include "app/gfx/canvas.h" |
8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
9 #include "app/l10n_util_win.h" | 9 #include "app/l10n_util_win.h" |
10 #include "app/resource_bundle.h" | 10 #include "app/resource_bundle.h" |
(...skipping 1182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1193 // TODO(jcampan): http://b/issue?id=1432077 Disabling accessibility in the | 1193 // TODO(jcampan): http://b/issue?id=1432077 Disabling accessibility in the |
1194 // renderer is a temporary work-around until that bug is fixed. | 1194 // renderer is a temporary work-around until that bug is fixed. |
1195 if (!renderer_accessible_) | 1195 if (!renderer_accessible_) |
1196 return reference_result; | 1196 return reference_result; |
1197 | 1197 |
1198 // Accessibility readers will send an OBJID_CLIENT message. | 1198 // Accessibility readers will send an OBJID_CLIENT message. |
1199 if (OBJID_CLIENT == lparam) { | 1199 if (OBJID_CLIENT == lparam) { |
1200 // If our MSAA DOM root is already created, reuse that pointer. Otherwise, | 1200 // If our MSAA DOM root is already created, reuse that pointer. Otherwise, |
1201 // create a new one. | 1201 // create a new one. |
1202 if (!browser_accessibility_root_) { | 1202 if (!browser_accessibility_root_) { |
1203 // Create a new instance of IAccessible. Root id is always 0. | 1203 // Create a new instance of IAccessible. Root id is 1000, to avoid |
| 1204 // conflicts with the ids used by MSAA. |
1204 BrowserAccessibilityManager::GetInstance()-> | 1205 BrowserAccessibilityManager::GetInstance()-> |
1205 CreateAccessibilityInstance(IID_IAccessible, 0, | 1206 CreateAccessibilityInstance(IID_IAccessible, 1000, |
1206 render_widget_host_->routing_id(), | 1207 render_widget_host_->routing_id(), |
1207 render_widget_host_->process()->pid(), | 1208 render_widget_host_->process()->pid(), |
1208 m_hWnd, reinterpret_cast<void **> | 1209 m_hWnd, reinterpret_cast<void **> |
1209 (&browser_accessibility_root_)); | 1210 (&browser_accessibility_root_)); |
1210 | 1211 |
1211 if (!browser_accessibility_root_) { | 1212 if (!browser_accessibility_root_) { |
1212 // No valid root found, return with failure. | 1213 // No valid root found, return with failure. |
1213 NOTREACHED(); | 1214 NOTREACHED(); |
1214 return static_cast<LRESULT>(0L); | 1215 return static_cast<LRESULT>(0L); |
1215 } | 1216 } |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1307 // WM_LBUTTONDOWN. | 1308 // WM_LBUTTONDOWN. |
1308 SetFocus(); | 1309 SetFocus(); |
1309 } | 1310 } |
1310 } | 1311 } |
1311 | 1312 |
1312 void RenderWidgetHostViewWin::ShutdownHost() { | 1313 void RenderWidgetHostViewWin::ShutdownHost() { |
1313 shutdown_factory_.RevokeAll(); | 1314 shutdown_factory_.RevokeAll(); |
1314 render_widget_host_->Shutdown(); | 1315 render_widget_host_->Shutdown(); |
1315 // Do not touch any members at this point, |this| has been deleted. | 1316 // Do not touch any members at this point, |this| has been deleted. |
1316 } | 1317 } |
OLD | NEW |