Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / extensions / shell / renderer / shell_content_renderer_client.h

diff --git a/src/extensions/shell/renderer/shell_content_renderer_client.h b/src/extensions/shell/renderer/shell_content_renderer_client.h
index e7a1fbc..c040e8e 100644 (file)
--- a/src/extensions/shell/renderer/shell_content_renderer_client.h
+++ b/src/extensions/shell/renderer/shell_content_renderer_client.h
@@ -21,16 +21,22 @@ class ShellRendererMainDelegate;
 // Renderer initialization and runtime support for app_shell.
 class ShellContentRendererClient : public content::ContentRendererClient {
  public:
-  explicit ShellContentRendererClient(
-      scoped_ptr<ShellRendererMainDelegate> delegate);
+  ShellContentRendererClient();
   virtual ~ShellContentRendererClient();
 
   // content::ContentRendererClient implementation:
   virtual void RenderThreadStarted() OVERRIDE;
   virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;
   virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
+  virtual bool OverrideCreatePlugin(content::RenderFrame* render_frame,
+                                    blink::WebLocalFrame* frame,
+                                    const blink::WebPluginParams& params,
+                                    blink::WebPlugin** plugin) OVERRIDE;
+  virtual blink::WebPlugin* CreatePluginReplacement(
+      content::RenderFrame* render_frame,
+      const base::FilePath& plugin_path) OVERRIDE;
   virtual bool WillSendRequest(blink::WebFrame* frame,
-                               content::PageTransition transition_type,
+                               ui::PageTransition transition_type,
                                const GURL& url,
                                const GURL& first_party_for_cookies,
                                GURL* new_url) OVERRIDE;
@@ -38,10 +44,15 @@ class ShellContentRendererClient : public content::ContentRendererClient {
                                       v8::Handle<v8::Context> context,
                                       int extension_group,
                                       int world_id) OVERRIDE;
+  virtual const void* CreatePPAPIInterface(
+      const std::string& interface_name) OVERRIDE;
+  virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE;
   virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE;
+  virtual content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
+      content::RenderFrame* render_frame,
+      const std::string& mime_type) OVERRIDE;
 
  private:
-  scoped_ptr<ShellRendererMainDelegate> delegate_;
   scoped_ptr<ShellExtensionsClient> extensions_client_;
   scoped_ptr<ShellExtensionsRendererClient> extensions_renderer_client_;
   scoped_ptr<DispatcherDelegate> extension_dispatcher_delegate_;