| Index: chrome/renderer/render_view.h
|
| diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
|
| index f81d847b8a837874ac2a750fd16ba1253baad4e6..ca0a2e6970985c369d9d0acc6f38d1bb8dfb64dc 100644
|
| --- a/chrome/renderer/render_view.h
|
| +++ b/chrome/renderer/render_view.h
|
| @@ -53,6 +53,7 @@
|
| #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebPageSerializerClient.h"
|
| +#include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
|
| @@ -272,6 +273,11 @@ class RenderView : public RenderWidget,
|
| // the plugin.
|
| void OnPepperPluginDestroy(WebPluginDelegatePepper* pepper_plugin);
|
|
|
| + // Create a new plugin without checking the content settings.
|
| + WebKit::WebPlugin* CreatePluginInternal(
|
| + WebKit::WebFrame* frame,
|
| + const WebKit::WebPluginParams& params);
|
| +
|
| // Asks the browser for the CPBrowsingContext associated with this renderer.
|
| // This is an opaque identifier associated with the renderer for sending
|
| // messages for the given "Chrome Plugin." The Chrome Plugin API is used
|
| @@ -428,7 +434,6 @@ class RenderView : public RenderWidget,
|
| WebKit::WebApplicationCacheHostClient* client);
|
| virtual WebKit::WebCookieJar* cookieJar();
|
| virtual void willClose(WebKit::WebFrame* frame);
|
| - virtual bool allowPlugins(WebKit::WebFrame* frame, bool enabled_per_settings);
|
| virtual bool allowImages(WebKit::WebFrame* frame, bool enabled_per_settings);
|
| virtual void loadURLExternally(WebKit::WebFrame* frame,
|
| const WebKit::WebURLRequest& request,
|
| @@ -853,6 +858,11 @@ class RenderView : public RenderWidget,
|
| // UI that is going to be hosted by this RenderView.
|
| void CreateDevToolsClient();
|
|
|
| + // Create a new placeholder for a blocked plugin.
|
| + WebKit::WebPlugin* CreatePluginPlaceholder(
|
| + WebKit::WebFrame* frame,
|
| + const WebKit::WebPluginParams& params);
|
| +
|
| // Sends an IPC notification that the specified content type was blocked.
|
| void DidBlockContentType(ContentSettingsType settings_type);
|
|
|
|
|