OLD | NEW |
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 CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 5 #ifndef CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
6 #define CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 6 #define CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 void loadURLExternally(const blink::WebURLRequest& request, | 89 void loadURLExternally(const blink::WebURLRequest& request, |
90 blink::WebNavigationPolicy policy, | 90 blink::WebNavigationPolicy policy, |
91 const blink::WebString& suggested_name, | 91 const blink::WebString& suggested_name, |
92 bool replaces_current_history_item) override { | 92 bool replaces_current_history_item) override { |
93 test_client()->loadURLExternally(request, policy, suggested_name, | 93 test_client()->loadURLExternally(request, policy, suggested_name, |
94 replaces_current_history_item); | 94 replaces_current_history_item); |
95 Base::loadURLExternally(request, policy, suggested_name, | 95 Base::loadURLExternally(request, policy, suggested_name, |
96 replaces_current_history_item); | 96 replaces_current_history_item); |
97 } | 97 } |
98 | 98 |
99 void didStartProvisionalLoad(blink::WebDataSource* data_source) override { | 99 void didStartProvisionalLoad(blink::WebDataSource* data_source, |
100 test_client()->didStartProvisionalLoad(data_source); | 100 blink::WebURLRequest& request) override { |
101 Base::didStartProvisionalLoad(data_source); | 101 test_client()->didStartProvisionalLoad(data_source, request); |
| 102 Base::didStartProvisionalLoad(data_source, request); |
102 } | 103 } |
103 | 104 |
104 void didReceiveServerRedirectForProvisionalLoad( | 105 void didReceiveServerRedirectForProvisionalLoad( |
105 blink::WebLocalFrame* frame) override { | 106 blink::WebLocalFrame* frame) override { |
106 test_client()->didReceiveServerRedirectForProvisionalLoad(frame); | 107 test_client()->didReceiveServerRedirectForProvisionalLoad(frame); |
107 Base::didReceiveServerRedirectForProvisionalLoad(frame); | 108 Base::didReceiveServerRedirectForProvisionalLoad(frame); |
108 } | 109 } |
109 | 110 |
110 void didFailProvisionalLoad( | 111 void didFailProvisionalLoad( |
111 blink::WebLocalFrame* frame, | 112 blink::WebLocalFrame* frame, |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 return test_client()->runFileChooser(params, completion); | 298 return test_client()->runFileChooser(params, completion); |
298 } | 299 } |
299 | 300 |
300 private: | 301 private: |
301 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 302 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
302 }; | 303 }; |
303 | 304 |
304 } // namespace test_runner | 305 } // namespace test_runner |
305 | 306 |
306 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 307 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
OLD | NEW |