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 | 10 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 | 42 |
43 // WebFrameClient implementation. | 43 // WebFrameClient implementation. |
44 virtual void didStartProvisionalLoad(blink::WebFrame* frame) | 44 virtual void didStartProvisionalLoad(blink::WebFrame* frame) |
45 { | 45 { |
46 if (m_version > 2) | 46 if (m_version > 2) |
47 m_baseProxy->didStartProvisionalLoad(frame); | 47 m_baseProxy->didStartProvisionalLoad(frame); |
48 Base::didStartProvisionalLoad(frame); | 48 Base::didStartProvisionalLoad(frame); |
49 } | 49 } |
50 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* fra
me) | 50 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* fra
me) |
51 { | 51 { |
| 52 m_baseProxy->didReceiveServerRedirectForProvisionalLoad(frame); |
52 Base::didReceiveServerRedirectForProvisionalLoad(frame); | 53 Base::didReceiveServerRedirectForProvisionalLoad(frame); |
53 } | 54 } |
54 virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::Web
URLError& error) | 55 virtual void didFailProvisionalLoad(blink::WebFrame* frame, const blink::Web
URLError& error) |
55 { | 56 { |
56 Base::didFailProvisionalLoad(frame, error); | 57 Base::didFailProvisionalLoad(frame, error); |
57 } | 58 } |
58 virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavi
gation) | 59 virtual void didCommitProvisionalLoad(blink::WebFrame* frame, bool isNewNavi
gation) |
59 { | 60 { |
60 Base::didCommitProvisionalLoad(frame, isNewNavigation); | 61 Base::didCommitProvisionalLoad(frame, isNewNavigation); |
61 } | 62 } |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 // It is used instead of a #define and is set by layouttest_support when | 148 // It is used instead of a #define and is set by layouttest_support when |
148 // creating this object. | 149 // creating this object. |
149 int m_version; | 150 int m_version; |
150 | 151 |
151 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 152 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
152 }; | 153 }; |
153 | 154 |
154 } | 155 } |
155 | 156 |
156 #endif // WebTestProxy_h | 157 #endif // WebTestProxy_h |
OLD | NEW |