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