1 files changed, 18 insertions, 11 deletions
diff --git a/chromium/content/renderer/pepper/renderer_ppapi_host_impl.h b/chromium/content/renderer/pepper/renderer_ppapi_host_impl.h
index c2ad0d1cb0d..a30735dc3c4 100644
--- a/chromium/content/renderer/pepper/renderer_ppapi_host_impl.h
+++ b/chromium/content/renderer/pepper/renderer_ppapi_host_impl.h
@@ -73,32 +73,36 @@ class RendererPpapiHostImpl : public RendererPpapiHost {
 
   PepperPluginInstanceImpl* GetPluginInstanceImpl(PP_Instance instance) const;
 
+  bool IsExternalPluginHost() const;
+
   // RendererPpapiHost implementation.
   virtual ppapi::host::PpapiHost* GetPpapiHost() OVERRIDE;
   virtual bool IsValidInstance(PP_Instance instance) const OVERRIDE;
-  virtual PepperPluginInstance* GetPluginInstance(
-      PP_Instance instance) const OVERRIDE;
-  virtual RenderFrame* GetRenderFrameForInstance(
-      PP_Instance instance) const OVERRIDE;
-  virtual RenderView* GetRenderViewForInstance(
-      PP_Instance instance) const OVERRIDE;
+  virtual PepperPluginInstance* GetPluginInstance(PP_Instance instance) const
+      OVERRIDE;
+  virtual RenderFrame* GetRenderFrameForInstance(PP_Instance instance) const
+      OVERRIDE;
+  virtual RenderView* GetRenderViewForInstance(PP_Instance instance) const
+      OVERRIDE;
   virtual blink::WebPluginContainer* GetContainerForInstance(
       PP_Instance instance) const OVERRIDE;
   virtual base::ProcessId GetPluginPID() const OVERRIDE;
   virtual bool HasUserGesture(PP_Instance instance) const OVERRIDE;
   virtual int GetRoutingIDForWidget(PP_Instance instance) const OVERRIDE;
-  virtual gfx::Point PluginPointToRenderFrame(
-      PP_Instance instance,
-      const gfx::Point& pt) const OVERRIDE;
+  virtual gfx::Point PluginPointToRenderFrame(PP_Instance instance,
+                                              const gfx::Point& pt) const
+      OVERRIDE;
   virtual IPC::PlatformFileForTransit ShareHandleWithRemote(
       base::PlatformFile handle,
       bool should_close_source) OVERRIDE;
   virtual bool IsRunningInProcess() const OVERRIDE;
+  virtual std::string GetPluginName() const OVERRIDE;
+  virtual void SetToExternalPluginHost() OVERRIDE;
   virtual void CreateBrowserResourceHosts(
       PP_Instance instance,
       const std::vector<IPC::Message>& nested_msgs,
-      const base::Callback<void(
-          const std::vector<int>&)>& callback) const OVERRIDE;
+      const base::Callback<void(const std::vector<int>&)>& callback) const
+      OVERRIDE;
   virtual GURL GetDocumentURL(PP_Instance instance) const OVERRIDE;
 
  private:
@@ -130,6 +134,9 @@ class RendererPpapiHostImpl : public RendererPpapiHost {
   // Whether the plugin is running in process.
   bool is_running_in_process_;
 
+  // Whether this is a host for external plugins.
+  bool is_external_plugin_host_;
+
   DISALLOW_COPY_AND_ASSIGN(RendererPpapiHostImpl);
 };