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

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

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_interfaces.cc ('k') | components/test_runner/web_test_proxy.cc » ('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 #ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ 5 #ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
6 #define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ 6 #define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 DCHECK(!web_view_); 65 DCHECK(!web_view_);
66 web_view_ = view; 66 web_view_ = view;
67 } 67 }
68 68
69 void set_view_test_client(scoped_ptr<WebViewTestClient> view_test_client) { 69 void set_view_test_client(scoped_ptr<WebViewTestClient> view_test_client) {
70 DCHECK(view_test_client); 70 DCHECK(view_test_client);
71 DCHECK(!view_test_client_); 71 DCHECK(!view_test_client_);
72 view_test_client_ = std::move(view_test_client); 72 view_test_client_ = std::move(view_test_client);
73 } 73 }
74 74
75 WebTestDelegate* delegate() { return delegate_; }
76 void set_delegate(WebTestDelegate* delegate) {
77 DCHECK(delegate);
78 DCHECK(!delegate_);
79 delegate_ = delegate;
80 }
81
75 void SetInterfaces(WebTestInterfaces* interfaces); 82 void SetInterfaces(WebTestInterfaces* interfaces);
76 void SetDelegate(WebTestDelegate* delegate);
77 83
78 std::string DumpBackForwardLists(); 84 std::string DumpBackForwardLists();
79 85
80 void LayoutAndPaintAsyncThen(const base::Closure& callback); 86 void LayoutAndPaintAsyncThen(const base::Closure& callback);
81 87
82 void GetScreenOrientationForTesting(blink::WebScreenInfo&); 88 void GetScreenOrientationForTesting(blink::WebScreenInfo&);
83 89
84 protected: 90 protected:
85 WebTestProxyBase(); 91 WebTestProxyBase();
86 ~WebTestProxyBase(); 92 ~WebTestProxyBase();
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 213
208 private: 214 private:
209 virtual ~WebTestProxy() {} 215 virtual ~WebTestProxy() {}
210 216
211 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); 217 DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
212 }; 218 };
213 219
214 } // namespace test_runner 220 } // namespace test_runner
215 221
216 #endif // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_ 222 #endif // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « components/test_runner/web_test_interfaces.cc ('k') | components/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698