OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SHELL_CONTENT_RENDERER_CLIENT_H_ | 5 #ifndef CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_ |
6 #define CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_ | 6 #define CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "content/public/renderer/content_renderer_client.h" | 10 #include "content/public/renderer/content_renderer_client.h" |
11 | 11 |
12 namespace WebKit { | 12 namespace WebKit { |
13 class WebFrame; | 13 class WebFrame; |
14 class WebPlugin; | 14 class WebPlugin; |
15 struct WebPluginParams; | 15 struct WebPluginParams; |
16 } | 16 } |
17 | 17 |
18 namespace content { | 18 namespace content { |
19 | 19 |
20 class RenderView; | 20 class RenderView; |
21 class ShellRenderProcessObserver; | 21 class ShellRenderProcessObserver; |
| 22 class WebKitTestRunner; |
22 | 23 |
23 class ShellContentRendererClient : public ContentRendererClient { | 24 class ShellContentRendererClient : public ContentRendererClient { |
24 public: | 25 public: |
25 ShellContentRendererClient(); | 26 ShellContentRendererClient(); |
26 virtual ~ShellContentRendererClient(); | 27 virtual ~ShellContentRendererClient(); |
27 virtual void RenderThreadStarted() OVERRIDE; | 28 virtual void RenderThreadStarted() OVERRIDE; |
28 virtual void RenderViewCreated(RenderView* render_view) OVERRIDE; | 29 virtual void RenderViewCreated(RenderView* render_view) OVERRIDE; |
| 30 virtual bool OverrideCreateRenderViewImpl( |
| 31 RenderViewImplParams* params, |
| 32 RenderViewImpl** render_view) OVERRIDE; |
29 virtual bool OverrideCreatePlugin( | 33 virtual bool OverrideCreatePlugin( |
30 RenderView* render_view, | 34 RenderView* render_view, |
31 WebKit::WebFrame* frame, | 35 WebKit::WebFrame* frame, |
32 const WebKit::WebPluginParams& params, | 36 const WebKit::WebPluginParams& params, |
33 WebKit::WebPlugin** plugin) OVERRIDE; | 37 WebKit::WebPlugin** plugin) OVERRIDE; |
34 | 38 |
35 private: | 39 private: |
36 scoped_ptr<ShellRenderProcessObserver> shell_observer_; | 40 scoped_ptr<ShellRenderProcessObserver> shell_observer_; |
| 41 WebKitTestRunner* latest_test_runner_; |
37 }; | 42 }; |
38 | 43 |
39 } // namespace content | 44 } // namespace content |
40 | 45 |
41 #endif // CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_ | 46 #endif // CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_ |
OLD | NEW |