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

Side by Side Diff: chrome/browser/accessibility/accessibility_win_browsertest.cc

Issue 10551002: TabContentsWrapper -> TabContents, part 56. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Not killing GetSelectedWebContents yet Created 8 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 | Annotate | Revision Log
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 #include <atlbase.h> 5 #include <atlbase.h>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 return; 203 return;
204 } 204 }
205 } 205 }
206 } 206 }
207 207
208 // Retrieve the MSAA client accessibility object for the Render Widget Host View 208 // Retrieve the MSAA client accessibility object for the Render Widget Host View
209 // of the selected tab. 209 // of the selected tab.
210 IAccessible* 210 IAccessible*
211 AccessibilityWinBrowserTest::GetRendererAccessible() { 211 AccessibilityWinBrowserTest::GetRendererAccessible() {
212 content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications( 212 content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications(
213 browser()->GetSelectedWebContents()->GetRenderViewHost()); 213 browser()->GetActiveWebContents()->GetRenderViewHost());
214 214
215 HWND hwnd_render_widget_host_view = 215 HWND hwnd_render_widget_host_view =
216 browser()->GetSelectedWebContents()->GetRenderWidgetHostView()-> 216 browser()->GetActiveWebContents()->GetRenderWidgetHostView()->
217 GetNativeView(); 217 GetNativeView();
218 218
219 // Invoke windows screen reader detection by sending the WM_GETOBJECT message 219 // Invoke windows screen reader detection by sending the WM_GETOBJECT message
220 // with kIdCustom as the LPARAM. 220 // with kIdCustom as the LPARAM.
221 const int32 kIdCustom = 1; 221 const int32 kIdCustom = 1;
222 SendMessage( 222 SendMessage(
223 hwnd_render_widget_host_view, WM_GETOBJECT, OBJID_CLIENT, kIdCustom); 223 hwnd_render_widget_host_view, WM_GETOBJECT, OBJID_CLIENT, kIdCustom);
224 224
225 IAccessible* accessible; 225 IAccessible* accessible;
226 HRESULT hr = AccessibleObjectFromWindow( 226 HRESULT hr = AccessibleObjectFromWindow(
227 hwnd_render_widget_host_view, OBJID_CLIENT, 227 hwnd_render_widget_host_view, OBJID_CLIENT,
228 IID_IAccessible, reinterpret_cast<void**>(&accessible)); 228 IID_IAccessible, reinterpret_cast<void**>(&accessible));
229 EXPECT_EQ(S_OK, hr); 229 EXPECT_EQ(S_OK, hr);
230 EXPECT_NE(accessible, reinterpret_cast<IAccessible*>(NULL)); 230 EXPECT_NE(accessible, reinterpret_cast<IAccessible*>(NULL));
231 231
232 return accessible; 232 return accessible;
233 } 233 }
234 234
235 void AccessibilityWinBrowserTest::ExecuteScript(wstring script) { 235 void AccessibilityWinBrowserTest::ExecuteScript(wstring script) {
236 browser()->GetSelectedWebContents()->GetRenderViewHost()-> 236 browser()->GetActiveWebContents()->GetRenderViewHost()->
237 ExecuteJavascriptInWebFrame(L"", script); 237 ExecuteJavascriptInWebFrame(L"", script);
238 } 238 }
239 239
240 // This constructor can be used if IA2 role will be the same as MSAA role 240 // This constructor can be used if IA2 role will be the same as MSAA role
241 AccessibleChecker::AccessibleChecker( 241 AccessibleChecker::AccessibleChecker(
242 wstring expected_name, int32 expected_role, wstring expected_value) : 242 wstring expected_name, int32 expected_role, wstring expected_value) :
243 name_(expected_name), 243 name_(expected_name),
244 role_(expected_role), 244 role_(expected_role),
245 ia2_role_(expected_role), 245 ia2_role_(expected_role),
246 value_(expected_value), 246 value_(expected_value),
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 902
903 // Check the browser's copy of the renderer accessibility tree. 903 // Check the browser's copy of the renderer accessibility tree.
904 AccessibleChecker grouping1_checker(L"", ROLE_SYSTEM_GROUPING, L""); 904 AccessibleChecker grouping1_checker(L"", ROLE_SYSTEM_GROUPING, L"");
905 AccessibleChecker grouping2_checker(L"", ROLE_SYSTEM_GROUPING, L""); 905 AccessibleChecker grouping2_checker(L"", ROLE_SYSTEM_GROUPING, L"");
906 AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L""); 906 AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
907 document_checker.AppendExpectedChild(&grouping1_checker); 907 document_checker.AppendExpectedChild(&grouping1_checker);
908 document_checker.AppendExpectedChild(&grouping2_checker); 908 document_checker.AppendExpectedChild(&grouping2_checker);
909 document_checker.CheckAccessible(GetRendererAccessible()); 909 document_checker.CheckAccessible(GetRendererAccessible());
910 } 910 }
911 } // namespace. 911 } // namespace.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698