| 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, | 99 void didStartProvisionalLoad(blink::WebLocalFrame* initiator_frame, |
| 100 blink::WebDataSource* data_source, |
| 100 blink::WebURLRequest& request) override { | 101 blink::WebURLRequest& request) override { |
| 101 test_client()->didStartProvisionalLoad(data_source, request); | 102 test_client()->didStartProvisionalLoad(initiator_frame, data_source, |
| 102 Base::didStartProvisionalLoad(data_source, request); | 103 request); |
| 104 Base::didStartProvisionalLoad(initiator_frame, data_source, request); |
| 103 } | 105 } |
| 104 | 106 |
| 105 void didReceiveServerRedirectForProvisionalLoad( | 107 void didReceiveServerRedirectForProvisionalLoad( |
| 106 blink::WebLocalFrame* frame) override { | 108 blink::WebLocalFrame* frame) override { |
| 107 test_client()->didReceiveServerRedirectForProvisionalLoad(frame); | 109 test_client()->didReceiveServerRedirectForProvisionalLoad(frame); |
| 108 Base::didReceiveServerRedirectForProvisionalLoad(frame); | 110 Base::didReceiveServerRedirectForProvisionalLoad(frame); |
| 109 } | 111 } |
| 110 | 112 |
| 111 void didFailProvisionalLoad( | 113 void didFailProvisionalLoad( |
| 112 blink::WebLocalFrame* frame, | 114 blink::WebLocalFrame* frame, |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 return test_client()->runFileChooser(params, completion); | 300 return test_client()->runFileChooser(params, completion); |
| 299 } | 301 } |
| 300 | 302 |
| 301 private: | 303 private: |
| 302 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 304 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 303 }; | 305 }; |
| 304 | 306 |
| 305 } // namespace test_runner | 307 } // namespace test_runner |
| 306 | 308 |
| 307 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 309 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| OLD | NEW |