Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9900)

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 649873006: Enable shadow DOM-based "missing plugin" placeholder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed deleting this in the previous patch set Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 9f99262d1107d5279a117484abf56333be0263a1..d3a592ca69531221479859b66ccf22a15cdeddf2 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -45,6 +45,7 @@
#include "chrome/renderer/playback_extension.h"
#include "chrome/renderer/plugins/chrome_plugin_placeholder.h"
#include "chrome/renderer/plugins/plugin_uma.h"
+#include "chrome/renderer/plugins/shadow_dom_plugin_placeholder.h"
#include "chrome/renderer/prefetch_helper.h"
#include "chrome/renderer/prerender/prerender_dispatcher.h"
#include "chrome/renderer/prerender/prerender_helper.h"
@@ -92,6 +93,7 @@
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
#include "third_party/WebKit/public/web/WebPluginParams.h"
+#include "third_party/WebKit/public/web/WebPluginPlaceholder.h"
#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
#include "ui/base/l10n/l10n_util.h"
@@ -547,6 +549,33 @@ const Extension* ChromeContentRendererClient::GetExtensionByOrigin(
}
#endif
+scoped_ptr<blink::WebPluginPlaceholder>
+ChromeContentRendererClient::CreatePluginPlaceholder(
+ content::RenderFrame* render_frame,
+ blink::WebLocalFrame* frame,
+ const blink::WebPluginParams& orig_params) {
Bernhard Bauer 2014/10/29 17:45:54 TBH, I would even move the rest of this method int
jbroman 2014/10/29 18:14:40 Hmm, okay. Done.
+ using Status = ChromeViewHostMsg_GetPluginInfo_Status;
+
+ if (!ShadowDOMPluginPlaceholderEnabled())
+ return nullptr;
+
+ std::string orig_mime_type = orig_params.mimeType.utf8();
+ // TODO(jbroman): Investigate whether browser plugin needs special handling.
+ ChromeViewHostMsg_GetPluginInfo_Output output;
+#if defined(ENABLE_PLUGINS)
+ render_frame->Send(
+ new ChromeViewHostMsg_GetPluginInfo(render_frame->GetRoutingID(),
+ GURL(orig_params.url),
+ frame->top()->document().url(),
+ orig_params.mimeType.utf8(),
+ &output));
+#else
+ output.status.value = Status::kNotFound;
+#endif
+
+ return CreateShadowDOMPlaceholderForPluginInfo(output, orig_params);
+}
+
bool ChromeContentRendererClient::OverrideCreatePlugin(
content::RenderFrame* render_frame,
WebLocalFrame* frame,

Powered by Google App Engine
This is Rietveld 408576698