content/renderer/render_view_browsertest.cc - Issue 273423004: Migrate accessibility from RenderView to RenderFrame.

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 273423004: Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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 side-by-side diff with in-line comments

Download patch

« content/browser/web_contents/web_contents_impl.h ('K') | « content/renderer/render_thread_impl.cc ('k') | content/renderer/render_view_impl.h » ('j') | content/renderer/render_view_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_browsertest.cc

diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc

index 7af38eda5f4f8cd93fd08dcec9da0fa41b1c3951..77c825f23c78ece69a78b35eedb1320746a1b514 100644

--- a/content/renderer/render_view_browsertest.cc

+++ b/content/renderer/render_view_browsertest.cc

@@ -2333,30 +2333,30 @@ TEST_F(RenderViewImplTest, ServiceWorkerNetworkProviderSetup) {

}

TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {

- ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode());

- ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility());

+ ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());

+ ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());

- view()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);

- ASSERT_EQ(AccessibilityModeTreeOnly, view()->accessibility_mode());

- ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());

+ frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);

+ ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode());

+ ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());

ASSERT_EQ(RendererAccessibilityTypeComplete,

- view()->renderer_accessibility()->GetType());

+ frame()->renderer_accessibility()->GetType());

- view()->OnSetAccessibilityMode(AccessibilityModeOff);

- ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode());

- ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility());

+ frame()->OnSetAccessibilityMode(AccessibilityModeOff);

+ ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());

+ ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());

- view()->OnSetAccessibilityMode(AccessibilityModeComplete);

- ASSERT_EQ(AccessibilityModeComplete, view()->accessibility_mode());

- ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());

+ frame()->OnSetAccessibilityMode(AccessibilityModeComplete);

+ ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());

+ ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());

ASSERT_EQ(RendererAccessibilityTypeComplete,

- view()->renderer_accessibility()->GetType());

+ frame()->renderer_accessibility()->GetType());

- view()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);

- ASSERT_EQ(AccessibilityModeEditableTextOnly, view()->accessibility_mode());

- ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());

+ frame()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);

+ ASSERT_EQ(AccessibilityModeEditableTextOnly, frame()->accessibility_mode());

+ ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());

ASSERT_EQ(RendererAccessibilityTypeFocusOnly,

- view()->renderer_accessibility()->GetType());

+ frame()->renderer_accessibility()->GetType());

}

TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {