| 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_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" | 9 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" |
| 10 #include "content/shell/renderer/test_runner/test_interfaces.h" | 10 #include "content/shell/renderer/test_runner/test_interfaces.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 | 60 |
| 61 virtual void loadURLExternally(blink::WebLocalFrame* frame, | 61 virtual void loadURLExternally(blink::WebLocalFrame* frame, |
| 62 const blink::WebURLRequest& request, | 62 const blink::WebURLRequest& request, |
| 63 blink::WebNavigationPolicy policy, | 63 blink::WebNavigationPolicy policy, |
| 64 const blink::WebString& suggested_name) { | 64 const blink::WebString& suggested_name) { |
| 65 base_proxy_->LoadURLExternally(frame, request, policy, suggested_name); | 65 base_proxy_->LoadURLExternally(frame, request, policy, suggested_name); |
| 66 Base::loadURLExternally(frame, request, policy, suggested_name); | 66 Base::loadURLExternally(frame, request, policy, suggested_name); |
| 67 } | 67 } |
| 68 | 68 |
| 69 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame, | 69 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame, |
| 70 bool isTransitionNavigation) { | 70 bool isTransitionNavigation, |
| 71 double triggeringEventTime) { |
| 71 base_proxy_->DidStartProvisionalLoad(frame); | 72 base_proxy_->DidStartProvisionalLoad(frame); |
| 72 Base::didStartProvisionalLoad(frame, isTransitionNavigation); | 73 Base::didStartProvisionalLoad( |
| 74 frame, isTransitionNavigation, triggeringEventTime); |
| 73 } | 75 } |
| 74 | 76 |
| 75 virtual void didReceiveServerRedirectForProvisionalLoad( | 77 virtual void didReceiveServerRedirectForProvisionalLoad( |
| 76 blink::WebLocalFrame* frame) { | 78 blink::WebLocalFrame* frame) { |
| 77 base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame); | 79 base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame); |
| 78 Base::didReceiveServerRedirectForProvisionalLoad(frame); | 80 Base::didReceiveServerRedirectForProvisionalLoad(frame); |
| 79 } | 81 } |
| 80 | 82 |
| 81 virtual void didFailProvisionalLoad(blink::WebLocalFrame* frame, | 83 virtual void didFailProvisionalLoad(blink::WebLocalFrame* frame, |
| 82 const blink::WebURLError& error) { | 84 const blink::WebURLError& error) { |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 #endif | 294 #endif |
| 293 | 295 |
| 294 WebTestProxyBase* base_proxy_; | 296 WebTestProxyBase* base_proxy_; |
| 295 | 297 |
| 296 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 298 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 297 }; | 299 }; |
| 298 | 300 |
| 299 } // namespace content | 301 } // namespace content |
| 300 | 302 |
| 301 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 303 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| OLD | NEW |