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

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

Issue 2349063002: Using the correct WebTestDelegate from WebFrameTestClient.
Patch Set: Created 4 years, 3 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 | « no previous file | components/test_runner/web_frame_test_client.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_FRAME_TEST_CLIENT_H_ 5 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_
6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_ 6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 10 matching lines...) Expand all
21 21
22 // WebFrameTestClient implements WebFrameClient interface, providing behavior 22 // WebFrameTestClient implements WebFrameClient interface, providing behavior
23 // expected by tests. WebFrameTestClient ends up used by WebFrameTestProxy 23 // expected by tests. WebFrameTestClient ends up used by WebFrameTestProxy
24 // which coordinates forwarding WebFrameClient calls either to 24 // which coordinates forwarding WebFrameClient calls either to
25 // WebFrameTestClient or to the product code (i.e. to RenderFrameImpl). 25 // WebFrameTestClient or to the product code (i.e. to RenderFrameImpl).
26 class WebFrameTestClient : public blink::WebFrameClient { 26 class WebFrameTestClient : public blink::WebFrameClient {
27 public: 27 public:
28 // Caller has to ensure that all arguments (|test_runner|, |delegate| and so 28 // Caller has to ensure that all arguments (|test_runner|, |delegate| and so
29 // forth) live longer than |this|. 29 // forth) live longer than |this|.
30 WebFrameTestClient(TestRunner* test_runner, 30 WebFrameTestClient(TestRunner* test_runner,
31 WebTestDelegate* delegate,
32 WebViewTestProxyBase* web_view_test_proxy_base, 31 WebViewTestProxyBase* web_view_test_proxy_base,
33 WebFrameTestProxyBase* web_frame_test_proxy_base); 32 WebFrameTestProxyBase* web_frame_test_proxy_base);
34 33
35 ~WebFrameTestClient() override; 34 ~WebFrameTestClient() override;
36 35
37 // WebFrameClient overrides needed by WebFrameTestProxy. 36 // WebFrameClient overrides needed by WebFrameTestProxy.
38 blink::WebColorChooser* createColorChooser( 37 blink::WebColorChooser* createColorChooser(
39 blink::WebColorChooserClient* client, 38 blink::WebColorChooserClient* client,
40 const blink::WebColor& initial_color, 39 const blink::WebColor& initial_color,
41 const blink::WebVector<blink::WebColorSuggestion>& suggestions) override; 40 const blink::WebVector<blink::WebColorSuggestion>& suggestions) override;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const blink::WebFrameClient::NavigationPolicyInfo& info) override; 99 const blink::WebFrameClient::NavigationPolicyInfo& info) override;
101 void checkIfAudioSinkExistsAndIsAuthorized( 100 void checkIfAudioSinkExistsAndIsAuthorized(
102 const blink::WebString& sink_id, 101 const blink::WebString& sink_id,
103 const blink::WebSecurityOrigin& security_origin, 102 const blink::WebSecurityOrigin& security_origin,
104 blink::WebSetSinkIdCallbacks* web_callbacks) override; 103 blink::WebSetSinkIdCallbacks* web_callbacks) override;
105 void didClearWindowObject(blink::WebLocalFrame* frame) override; 104 void didClearWindowObject(blink::WebLocalFrame* frame) override;
106 bool runFileChooser(const blink::WebFileChooserParams& params, 105 bool runFileChooser(const blink::WebFileChooserParams& params,
107 blink::WebFileChooserCompletion* completion) override; 106 blink::WebFileChooserCompletion* completion) override;
108 107
109 private: 108 private:
109 WebTestDelegate* delegate();
110
110 // Borrowed pointers to other parts of Layout Tests state. 111 // Borrowed pointers to other parts of Layout Tests state.
111 TestRunner* test_runner_; 112 TestRunner* test_runner_;
112 WebTestDelegate* delegate_;
113 WebViewTestProxyBase* web_view_test_proxy_base_; 113 WebViewTestProxyBase* web_view_test_proxy_base_;
114 WebFrameTestProxyBase* web_frame_test_proxy_base_; 114 WebFrameTestProxyBase* web_frame_test_proxy_base_;
115 115
116 DISALLOW_COPY_AND_ASSIGN(WebFrameTestClient); 116 DISALLOW_COPY_AND_ASSIGN(WebFrameTestClient);
117 }; 117 };
118 118
119 } // namespace test_runner 119 } // namespace test_runner
120 120
121 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_ 121 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | components/test_runner/web_frame_test_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698