| 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_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 5 #ifndef CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| 6 #define CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 6 #define CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 // for layering purposes. | 51 // for layering purposes. |
| 52 template <class Base, typename P> | 52 template <class Base, typename P> |
| 53 class WebFrameTestProxy : public Base, public WebFrameTestProxyBase { | 53 class WebFrameTestProxy : public Base, public WebFrameTestProxyBase { |
| 54 public: | 54 public: |
| 55 explicit WebFrameTestProxy(P p) : Base(p) {} | 55 explicit WebFrameTestProxy(P p) : Base(p) {} |
| 56 | 56 |
| 57 virtual ~WebFrameTestProxy() {} | 57 virtual ~WebFrameTestProxy() {} |
| 58 | 58 |
| 59 // WebFrameClient implementation. | 59 // WebFrameClient implementation. |
| 60 blink::WebPlugin* CreatePlugin( | 60 blink::WebPlugin* CreatePlugin( |
| 61 blink::WebLocalFrame* frame, | |
| 62 const blink::WebPluginParams& params) override { | 61 const blink::WebPluginParams& params) override { |
| 63 blink::WebPlugin* plugin = test_client()->CreatePlugin(frame, params); | 62 blink::WebPlugin* plugin = test_client()->CreatePlugin(params); |
| 64 if (plugin) | 63 if (plugin) |
| 65 return plugin; | 64 return plugin; |
| 66 return Base::CreatePlugin(frame, params); | 65 return Base::CreatePlugin(params); |
| 67 } | 66 } |
| 68 | 67 |
| 69 blink::WebScreenOrientationClient* GetWebScreenOrientationClient() override { | 68 blink::WebScreenOrientationClient* GetWebScreenOrientationClient() override { |
| 70 return test_client()->GetWebScreenOrientationClient(); | 69 return test_client()->GetWebScreenOrientationClient(); |
| 71 } | 70 } |
| 72 | 71 |
| 73 void DidAddMessageToConsole(const blink::WebConsoleMessage& message, | 72 void DidAddMessageToConsole(const blink::WebConsoleMessage& message, |
| 74 const blink::WebString& source_name, | 73 const blink::WebString& source_name, |
| 75 unsigned source_line, | 74 unsigned source_line, |
| 76 const blink::WebString& stack_trace) override { | 75 const blink::WebString& stack_trace) override { |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 return test_client()->RunFileChooser(params, completion); | 288 return test_client()->RunFileChooser(params, completion); |
| 290 } | 289 } |
| 291 | 290 |
| 292 private: | 291 private: |
| 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 // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ | 297 #endif // CONTENT_SHELL_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ |
| OLD | NEW |