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

Side by Side Diff: components/test_runner/web_test_proxy.cc

Issue 1885993002: Use correct WebTestDelegate from WebViewTestClient and WebTestProxyBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Extracted focused view tracking to https://crrev.com/1886013002 Created 4 years, 8 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
« no previous file with comments | « components/test_runner/web_test_proxy.h ('k') | components/test_runner/web_view_test_client.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/test_runner/web_test_proxy.h" 5 #include "components/test_runner/web_test_proxy.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <cctype> 10 #include <cctype>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 WebTestProxyBase::~WebTestProxyBase() { 86 WebTestProxyBase::~WebTestProxyBase() {
87 test_interfaces_->WindowClosed(this); 87 test_interfaces_->WindowClosed(this);
88 } 88 }
89 89
90 void WebTestProxyBase::SetInterfaces(WebTestInterfaces* interfaces) { 90 void WebTestProxyBase::SetInterfaces(WebTestInterfaces* interfaces) {
91 test_interfaces_ = interfaces->GetTestInterfaces(); 91 test_interfaces_ = interfaces->GetTestInterfaces();
92 test_interfaces_->WindowOpened(this); 92 test_interfaces_->WindowOpened(this);
93 } 93 }
94 94
95 void WebTestProxyBase::SetDelegate(WebTestDelegate* delegate) {
96 delegate_ = delegate;
97 }
98
99 std::string WebTestProxyBase::DumpBackForwardLists() { 95 std::string WebTestProxyBase::DumpBackForwardLists() {
100 return DumpAllBackForwardLists(test_interfaces_, delegate_); 96 return DumpAllBackForwardLists(test_interfaces_, delegate_);
101 } 97 }
102 98
103 void LayoutAndPaintCallback::didLayoutAndPaint() { 99 void LayoutAndPaintCallback::didLayoutAndPaint() {
104 TRACE_EVENT0("shell", "LayoutAndPaintCallback::didLayoutAndPaint"); 100 TRACE_EVENT0("shell", "LayoutAndPaintCallback::didLayoutAndPaint");
105 if (wait_for_popup_) { 101 if (wait_for_popup_) {
106 wait_for_popup_ = false; 102 wait_for_popup_ = false;
107 return; 103 return;
108 } 104 }
(...skipping 20 matching lines...) Expand all
129 MockScreenOrientationClient* mock_client = 125 MockScreenOrientationClient* mock_client =
130 test_interfaces_->GetTestRunner()->getMockScreenOrientationClient(); 126 test_interfaces_->GetTestRunner()->getMockScreenOrientationClient();
131 if (mock_client->IsDisabled()) 127 if (mock_client->IsDisabled())
132 return; 128 return;
133 // Override screen orientation information with mock data. 129 // Override screen orientation information with mock data.
134 screen_info.orientationType = mock_client->CurrentOrientationType(); 130 screen_info.orientationType = mock_client->CurrentOrientationType();
135 screen_info.orientationAngle = mock_client->CurrentOrientationAngle(); 131 screen_info.orientationAngle = mock_client->CurrentOrientationAngle();
136 } 132 }
137 133
138 } // namespace test_runner 134 } // namespace test_runner
OLDNEW
« no previous file with comments | « components/test_runner/web_test_proxy.h ('k') | components/test_runner/web_view_test_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698