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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 10868012: Browser Plugin: New Implementation (Browser Side) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-trial-obrowser
Patch Set: integrate windows fix by Fady (original cl #10910228) Created 8 years, 3 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 1295659538b5a1178a020d94fa38ee6afbb96dd6..79a5438b451875af479a09efe5deca69ac55584d 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -313,10 +313,12 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
WebPlugin** plugin) {
std::string orig_mime_type = params.mimeType.utf8();
- if (orig_mime_type == content::kBrowserPluginMimeType &&
- extensions::ExtensionHelper::Get(render_view)->view_type() ==
- VIEW_TYPE_APP_SHELL)
+ if (orig_mime_type == content::kBrowserPluginNewMimeType ||
+ ((orig_mime_type == content::kBrowserPluginMimeType) &&
+ extensions::ExtensionHelper::Get(render_view)->view_type() ==
+ VIEW_TYPE_APP_SHELL)) {
return false;
+ }
ChromeViewHostMsg_GetPluginInfo_Output output;
render_view->Send(new ChromeViewHostMsg_GetPluginInfo(

Powered by Google App Engine
This is Rietveld 408576698