Chromium Code Reviews| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 } | 42 } |
| 43 | 43 |
| 44 // WebFrameClient implementation. | 44 // WebFrameClient implementation. |
| 45 virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType ) | 45 virtual bool canCreatePluginWithoutRenderer(const blink::WebString& mimeType ) |
| 46 { | 46 { |
| 47 using blink::WebString; | 47 using blink::WebString; |
| 48 | 48 |
| 49 const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-re nderer")); | 49 const CR_DEFINE_STATIC_LOCAL(WebString, suffix, ("-can-create-without-re nderer")); |
| 50 return mimeType.utf8().find(suffix.utf8()) != std::string::npos; | 50 return mimeType.utf8().find(suffix.utf8()) != std::string::npos; |
| 51 } | 51 } |
| 52 virtual void loadURLExternally(blink::WebFrame* frame, const blink::WebURLRe quest& request, blink::WebNavigationPolicy policy, const blink::WebString& sugge sted_name) | |
|
dmazzoni
2014/03/14 21:03:35
Could you add OVERRIDE to all of the functions tha
asanka
2014/03/14 21:45:32
Done.
| |
| 53 { | |
| 54 m_baseProxy->loadURLExternally(frame, request, policy, suggested_name); | |
| 55 Base::loadURLExternally(frame, request, policy, suggested_name); | |
| 56 } | |
| 52 virtual void didStartProvisionalLoad(blink::WebFrame* frame) | 57 virtual void didStartProvisionalLoad(blink::WebFrame* frame) |
| 53 { | 58 { |
| 54 if (m_version > 2) | 59 if (m_version > 2) |
| 55 m_baseProxy->didStartProvisionalLoad(frame); | 60 m_baseProxy->didStartProvisionalLoad(frame); |
| 56 Base::didStartProvisionalLoad(frame); | 61 Base::didStartProvisionalLoad(frame); |
| 57 } | 62 } |
| 58 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* fra me) | 63 virtual void didReceiveServerRedirectForProvisionalLoad(blink::WebFrame* fra me) |
| 59 { | 64 { |
| 60 m_baseProxy->didReceiveServerRedirectForProvisionalLoad(frame); | 65 m_baseProxy->didReceiveServerRedirectForProvisionalLoad(frame); |
| 61 Base::didReceiveServerRedirectForProvisionalLoad(frame); | 66 Base::didReceiveServerRedirectForProvisionalLoad(frame); |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 164 // It is used instead of a #define and is set by layouttest_support when | 169 // It is used instead of a #define and is set by layouttest_support when |
| 165 // creating this object. | 170 // creating this object. |
| 166 int m_version; | 171 int m_version; |
| 167 | 172 |
| 168 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); | 173 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); |
| 169 }; | 174 }; |
| 170 | 175 |
| 171 } | 176 } |
| 172 | 177 |
| 173 #endif // WebTestProxy_h | 178 #endif // WebTestProxy_h |
| OLD | NEW |