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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 407493004: Revert of Revert of Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 2316 matching lines...) Expand 10 before | Expand all | Expand 10 after
2327 request.setTargetType(blink::WebURLRequest::TargetIsSubresource); 2327 request.setTargetType(blink::WebURLRequest::TargetIsSubresource);
2328 blink::WebURLResponse redirect_response; 2328 blink::WebURLResponse redirect_response;
2329 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response); 2329 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);
2330 extra_data = static_cast<RequestExtraData*>(request.extraData()); 2330 extra_data = static_cast<RequestExtraData*>(request.extraData());
2331 ASSERT_TRUE(extra_data); 2331 ASSERT_TRUE(extra_data);
2332 EXPECT_EQ(extra_data->service_worker_provider_id(), 2332 EXPECT_EQ(extra_data->service_worker_provider_id(),
2333 provider->provider_id()); 2333 provider->provider_id());
2334 } 2334 }
2335 2335
2336 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) { 2336 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
2337 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode()); 2337 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2338 ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2338 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2339 2339
2340 view()->OnSetAccessibilityMode(AccessibilityModeTreeOnly); 2340 frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);
2341 ASSERT_EQ(AccessibilityModeTreeOnly, view()->accessibility_mode()); 2341 ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode());
2342 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2342 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2343 ASSERT_EQ(RendererAccessibilityTypeComplete, 2343 ASSERT_EQ(RendererAccessibilityTypeComplete,
2344 view()->renderer_accessibility()->GetType()); 2344 frame()->renderer_accessibility()->GetType());
2345 2345
2346 view()->OnSetAccessibilityMode(AccessibilityModeOff); 2346 frame()->OnSetAccessibilityMode(AccessibilityModeOff);
2347 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode()); 2347 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2348 ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2348 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2349 2349
2350 view()->OnSetAccessibilityMode(AccessibilityModeComplete); 2350 frame()->OnSetAccessibilityMode(AccessibilityModeComplete);
2351 ASSERT_EQ(AccessibilityModeComplete, view()->accessibility_mode()); 2351 ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());
2352 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2352 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2353 ASSERT_EQ(RendererAccessibilityTypeComplete, 2353 ASSERT_EQ(RendererAccessibilityTypeComplete,
2354 view()->renderer_accessibility()->GetType()); 2354 frame()->renderer_accessibility()->GetType());
2355 2355
2356 view()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly); 2356 frame()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);
2357 ASSERT_EQ(AccessibilityModeEditableTextOnly, view()->accessibility_mode()); 2357 ASSERT_EQ(AccessibilityModeEditableTextOnly, frame()->accessibility_mode());
2358 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2358 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2359 ASSERT_EQ(RendererAccessibilityTypeFocusOnly, 2359 ASSERT_EQ(RendererAccessibilityTypeFocusOnly,
2360 view()->renderer_accessibility()->GetType()); 2360 frame()->renderer_accessibility()->GetType());
2361 } 2361 }
2362 2362
2363 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) { 2363 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {
2364 LoadHTML("<body style='min-height:1000px;'></body>"); 2364 LoadHTML("<body style='min-height:1000px;'></body>");
2365 2365
2366 blink::WebDeviceEmulationParams params; 2366 blink::WebDeviceEmulationParams params;
2367 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)"); 2367 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)");
2368 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)"); 2368 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)");
2369 int width, height; 2369 int width, height;
2370 2370
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
2430 ProcessPendingMessages(); 2430 ProcessPendingMessages();
2431 base::Time after_navigation = 2431 base::Time after_navigation =
2432 base::Time::Now() + base::TimeDelta::FromDays(1); 2432 base::Time::Now() + base::TimeDelta::FromDays(1);
2433 2433
2434 base::Time late_nav_reported_start = 2434 base::Time late_nav_reported_start =
2435 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart()); 2435 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
2436 EXPECT_LE(late_nav_reported_start, after_navigation); 2436 EXPECT_LE(late_nav_reported_start, after_navigation);
2437 } 2437 }
2438 2438
2439 } // namespace content 2439 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698