chrome/renderer/chrome_content_renderer_client.cc - Issue 10868012: Browser Plugin: New Implementation (Browser Side)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Address two nits from original CL's comments by creis Created 8 years, 4 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_host_browsertest.cc » ('j') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 168a585aa14394aa6a8224d3795d4567f92bebda..7495b4929bfe0ddc7bf9e264dba2c83c39ad1ee9 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),