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

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: Disable BrowserPluginHostTest.NavigateGuest on win, flaking. 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
« no previous file with comments | « no previous file | content/browser/browser_plugin/browser_plugin_embedder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 40c9c1b339e91972f13d8e26ced634e87d3d20dd..c692fa2950d2deea21667fcb13f0198304b9cb8a 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -316,10 +316,12 @@ bool ChromeContentRendererClient::OverrideCreatePlugin(
std::string actual_mime_type;
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;
+ }
render_view->Send(new ChromeViewHostMsg_GetPluginInfo(
render_view->GetRoutingID(), GURL(params.url),
« no previous file with comments | « no previous file | content/browser/browser_plugin/browser_plugin_embedder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698