| 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 "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "components/test_runner/mock_screen_orientation_client.h" | 9 #include "components/test_runner/mock_screen_orientation_client.h" |
| 10 #include "components/test_runner/web_test_delegate.h" | 10 #include "components/test_runner/web_test_delegate.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 base_proxy_->DidReceiveTitle(frame, title, direction); | 103 base_proxy_->DidReceiveTitle(frame, title, direction); |
| 104 Base::didReceiveTitle(frame, title, direction); | 104 Base::didReceiveTitle(frame, title, direction); |
| 105 } | 105 } |
| 106 | 106 |
| 107 virtual void didChangeIcon(blink::WebLocalFrame* frame, | 107 virtual void didChangeIcon(blink::WebLocalFrame* frame, |
| 108 blink::WebIconURL::Type icon_type) { | 108 blink::WebIconURL::Type icon_type) { |
| 109 base_proxy_->DidChangeIcon(frame, icon_type); | 109 base_proxy_->DidChangeIcon(frame, icon_type); |
| 110 Base::didChangeIcon(frame, icon_type); | 110 Base::didChangeIcon(frame, icon_type); |
| 111 } | 111 } |
| 112 | 112 |
| 113 virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame) { | 113 virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame, bool empty) { |
| 114 base_proxy_->DidFinishDocumentLoad(frame); | 114 base_proxy_->DidFinishDocumentLoad(frame); |
| 115 Base::didFinishDocumentLoad(frame); | 115 Base::didFinishDocumentLoad(frame, empty); |
| 116 } | 116 } |
| 117 | 117 |
| 118 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame) { | 118 virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame) { |
| 119 base_proxy_->DidHandleOnloadEvents(frame); | 119 base_proxy_->DidHandleOnloadEvents(frame); |
| 120 Base::didHandleOnloadEvents(frame); | 120 Base::didHandleOnloadEvents(frame); |
| 121 } | 121 } |
| 122 | 122 |
| 123 virtual void didFailLoad(blink::WebLocalFrame* frame, | 123 virtual void didFailLoad(blink::WebLocalFrame* frame, |
| 124 const blink::WebURLError& error, | 124 const blink::WebURLError& error, |
| 125 blink::WebHistoryCommitType commit_type) { | 125 blink::WebHistoryCommitType commit_type) { |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 // into the base proxy. | 233 // into the base proxy. |
| 234 base_proxy_->DidChangeResourcePriority( | 234 base_proxy_->DidChangeResourcePriority( |
| 235 frame, identifier, priority, intra_priority_value); | 235 frame, identifier, priority, intra_priority_value); |
| 236 Base::didChangeResourcePriority( | 236 Base::didChangeResourcePriority( |
| 237 frame, identifier, priority, intra_priority_value); | 237 frame, identifier, priority, intra_priority_value); |
| 238 } | 238 } |
| 239 | 239 |
| 240 virtual void didFinishResourceLoad(blink::WebLocalFrame* frame, | 240 virtual void didFinishResourceLoad(blink::WebLocalFrame* frame, |
| 241 unsigned identifier) { | 241 unsigned identifier) { |
| 242 base_proxy_->DidFinishResourceLoad(frame, identifier); | 242 base_proxy_->DidFinishResourceLoad(frame, identifier); |
| 243 Base::didFinishResourceLoad(frame, identifier); | |
| 244 } | 243 } |
| 245 | 244 |
| 246 virtual blink::WebNavigationPolicy decidePolicyForNavigation( | 245 virtual blink::WebNavigationPolicy decidePolicyForNavigation( |
| 247 const blink::WebFrameClient::NavigationPolicyInfo& info) { | 246 const blink::WebFrameClient::NavigationPolicyInfo& info) { |
| 248 blink::WebNavigationPolicy policy = base_proxy_->DecidePolicyForNavigation( | 247 blink::WebNavigationPolicy policy = base_proxy_->DecidePolicyForNavigation( |
| 249 info); | 248 info); |
| 250 if (policy == blink::WebNavigationPolicyIgnore) | 249 if (policy == blink::WebNavigationPolicyIgnore) |
| 251 return policy; | 250 return policy; |
| 252 | 251 |
| 253 return Base::decidePolicyForNavigation(info); | 252 return Base::decidePolicyForNavigation(info); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 | 288 |
| 290 private: | 289 private: |
| 291 WebTestProxyBase* base_proxy_; | 290 WebTestProxyBase* base_proxy_; |
| 292 | 291 |
| 293 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 292 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 294 }; | 293 }; |
| 295 | 294 |
| 296 } // namespace test_runner | 295 } // namespace test_runner |
| 297 | 296 |
| 298 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 297 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| OLD | NEW |