| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_WEBFRAMETESTPROXY_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ |
| 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ | 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBFRAMETESTPROXY_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "content/shell/renderer/test_runner/WebTestProxy.h" | 9 #include "content/shell/renderer/test_runner/WebTestProxy.h" |
| 10 #include "third_party/WebKit/public/platform/WebString.h" | 10 #include "third_party/WebKit/public/platform/WebString.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, bl
ink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) | 120 virtual void willSendRequest(blink::WebFrame* frame, unsigned identifier, bl
ink::WebURLRequest& request, const blink::WebURLResponse& redirectResponse) |
| 121 { | 121 { |
| 122 m_baseProxy->willSendRequest(frame, identifier, request, redirectRespons
e); | 122 m_baseProxy->willSendRequest(frame, identifier, request, redirectRespons
e); |
| 123 Base::willSendRequest(frame, identifier, request, redirectResponse); | 123 Base::willSendRequest(frame, identifier, request, redirectResponse); |
| 124 } | 124 } |
| 125 virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier,
const blink::WebURLResponse& response) | 125 virtual void didReceiveResponse(blink::WebFrame* frame, unsigned identifier,
const blink::WebURLResponse& response) |
| 126 { | 126 { |
| 127 m_baseProxy->didReceiveResponse(frame, identifier, response); | 127 m_baseProxy->didReceiveResponse(frame, identifier, response); |
| 128 Base::didReceiveResponse(frame, identifier, response); | 128 Base::didReceiveResponse(frame, identifier, response); |
| 129 } | 129 } |
| 130 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden
tifier, const blink::WebURLRequest::Priority& priority) | 130 virtual void didChangeResourcePriority(blink::WebFrame* frame, unsigned iden
tifier, const blink::WebURLRequest::Priority& priority, int intra_priority_value
) |
| 131 { | 131 { |
| 132 // This is not implemented in RenderFrameImpl, so need to explicitly cal
l | 132 // This is not implemented in RenderFrameImpl, so need to explicitly cal
l |
| 133 // into the base proxy. | 133 // into the base proxy. |
| 134 m_baseProxy->didChangeResourcePriority(frame, identifier, priority); | 134 m_baseProxy->didChangeResourcePriority(frame, identifier, priority, intr
a_priority_value); |
| 135 Base::didChangeResourcePriority(frame, identifier, priority); | 135 Base::didChangeResourcePriority(frame, identifier, priority, intra_prior
ity_value); |
| 136 } | 136 } |
| 137 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi
er) | 137 virtual void didFinishResourceLoad(blink::WebFrame* frame, unsigned identifi
er) |
| 138 { | 138 { |
| 139 Base::didFinishResourceLoad(frame, identifier); | 139 Base::didFinishResourceLoad(frame, identifier); |
| 140 } | 140 } |
| 141 virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame
* frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest&
request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolic
y, bool isRedirect) | 141 virtual blink::WebNavigationPolicy decidePolicyForNavigation(blink::WebFrame
* frame, blink::WebDataSource::ExtraData* extraData, const blink::WebURLRequest&
request, blink::WebNavigationType type, blink::WebNavigationPolicy defaultPolic
y, bool isRedirect) |
| 142 { | 142 { |
| 143 return Base::decidePolicyForNavigation(frame, extraData, request, type,
defaultPolicy, isRedirect); | 143 return Base::decidePolicyForNavigation(frame, extraData, request, type,
defaultPolicy, isRedirect); |
| 144 } | 144 } |
| 145 virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame,
blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMess
ageEvent event) | 145 virtual bool willCheckAndDispatchMessageEvent(blink::WebFrame* sourceFrame,
blink::WebFrame* targetFrame, blink::WebSecurityOrigin target, blink::WebDOMMess
ageEvent event) |
| (...skipping 10 matching lines...) Expand all Loading... |
| 156 // It is used instead of a #define and is set by layouttest_support when | 156 // It is used instead of a #define and is set by layouttest_support when |
| 157 // creating this object. | 157 // creating this object. |
| 158 int m_version; | 158 int m_version; |
| 159 | 159 |
| 160 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 160 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 161 }; | 161 }; |
| 162 | 162 |
| 163 } | 163 } |
| 164 | 164 |
| 165 #endif // WebTestProxy_h | 165 #endif // WebTestProxy_h |
| OLD | NEW |