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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 688173002: Refactor RendererAccessibiltiyComplete back into RendererAccessibility. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« content/renderer/accessibility/renderer_accessibility.h ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | 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 12 matching lines...) Expand all
23 #include "content/public/common/url_constants.h" 23 #include "content/public/common/url_constants.h"
24 #include "content/public/common/url_utils.h" 24 #include "content/public/common/url_utils.h"
25 #include "content/public/renderer/content_renderer_client.h" 25 #include "content/public/renderer/content_renderer_client.h"
26 #include "content/public/renderer/document_state.h" 26 #include "content/public/renderer/document_state.h"
27 #include "content/public/renderer/navigation_state.h" 27 #include "content/public/renderer/navigation_state.h"
28 #include "content/public/test/browser_test_utils.h" 28 #include "content/public/test/browser_test_utils.h"
29 #include "content/public/test/frame_load_waiter.h" 29 #include "content/public/test/frame_load_waiter.h"
30 #include "content/public/test/render_view_test.h" 30 #include "content/public/test/render_view_test.h"
31 #include "content/public/test/test_utils.h" 31 #include "content/public/test/test_utils.h"
32 #include "content/renderer/accessibility/renderer_accessibility.h" 32 #include "content/renderer/accessibility/renderer_accessibility.h"
33 #include "content/renderer/accessibility/renderer_accessibility_complete.h"
34 #include "content/renderer/history_controller.h" 33 #include "content/renderer/history_controller.h"
35 #include "content/renderer/history_serialization.h" 34 #include "content/renderer/history_serialization.h"
36 #include "content/renderer/render_process.h" 35 #include "content/renderer/render_process.h"
37 #include "content/renderer/render_view_impl.h" 36 #include "content/renderer/render_view_impl.h"
38 #include "content/shell/browser/shell.h" 37 #include "content/shell/browser/shell.h"
39 #include "content/shell/browser/shell_browser_context.h" 38 #include "content/shell/browser/shell_browser_context.h"
40 #include "content/test/mock_keyboard.h" 39 #include "content/test/mock_keyboard.h"
41 #include "net/base/net_errors.h" 40 #include "net/base/net_errors.h"
42 #include "net/cert/cert_status_flags.h" 41 #include "net/cert/cert_status_flags.h"
43 #include "testing/gtest/include/gtest/gtest.h" 42 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 2355 matching lines...) Expand 10 before | Expand all | Expand 10 after
2399 provider->provider_id()); 2398 provider->provider_id());
2400 } 2399 }
2401 2400
2402 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) { 2401 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
2403 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode()); 2402 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2404 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility()); 2403 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2405 2404
2406 frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly); 2405 frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);
2407 ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode()); 2406 ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode());
2408 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility()); 2407 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2409 ASSERT_EQ(RendererAccessibilityTypeComplete,
2410 frame()->renderer_accessibility()->GetType());
2411 2408
2412 frame()->OnSetAccessibilityMode(AccessibilityModeOff); 2409 frame()->OnSetAccessibilityMode(AccessibilityModeOff);
2413 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode()); 2410 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2414 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility()); 2411 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2415 2412
2416 frame()->OnSetAccessibilityMode(AccessibilityModeComplete); 2413 frame()->OnSetAccessibilityMode(AccessibilityModeComplete);
2417 ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode()); 2414 ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());
2418 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility()); 2415 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2419 ASSERT_EQ(RendererAccessibilityTypeComplete,
2420 frame()->renderer_accessibility()->GetType());
2421 } 2416 }
2422 2417
2423 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) { 2418 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {
2424 LoadHTML("<body style='min-height:1000px;'></body>"); 2419 LoadHTML("<body style='min-height:1000px;'></body>");
2425 2420
2426 blink::WebDeviceEmulationParams params; 2421 blink::WebDeviceEmulationParams params;
2427 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)"); 2422 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)");
2428 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)"); 2423 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)");
2429 int width, height; 2424 int width, height;
2430 2425
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
2493 ProcessPendingMessages(); 2488 ProcessPendingMessages();
2494 base::Time after_navigation = 2489 base::Time after_navigation =
2495 base::Time::Now() + base::TimeDelta::FromDays(1); 2490 base::Time::Now() + base::TimeDelta::FromDays(1);
2496 2491
2497 base::Time late_nav_reported_start = 2492 base::Time late_nav_reported_start =
2498 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart()); 2493 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
2499 EXPECT_LE(late_nav_reported_start, after_navigation); 2494 EXPECT_LE(late_nav_reported_start, after_navigation);
2500 } 2495 }
2501 2496
2502 } // namespace content 2497 } // namespace content
OLDNEW
« content/renderer/accessibility/renderer_accessibility.h ('K') | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698