Issue 12315023: Merge 180159

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

Issue 12315023: Merge 180159 (Closed)

Created:
7 years, 10 months ago by Chris Evans

Modified:
7 years, 10 months ago

Reviewers:
Chris Evans

CC:
chromium-reviews, Avi (use Gerrit), creis+watch_chromium.org, jam, joi+watch-content_chromium.org, darin-cc_chromium.org, ajwong+watch_chromium.org, stuartmorgan+watch_chromium.org, markusheintz_

Base URL:
svn://svn.chromium.org/chrome/branches/1364/src/

Visibility:
Public.

More Reviews

Description

Merge 180159 > Only permit plug-in loads in the browser if the plug-in isn't blocked or the > user has authorized it with a browser-mediated interaction. > > (Reland https://codereview.chromium.org/12086077 with Android test tweak) > > BUG=172573 > R=jam@chromium.org > Review URL: https://codereview.chromium.org/12092107 TBR=cevans@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183685

Patch Set 1 #

Created: 7 years, 10 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+265 lines, -53 lines)			Patch
M	chrome/browser/chrome_plugin_service_filter.h	View	5 chunks	+29 lines, -3 lines	0 comments	Download
M	chrome/browser/chrome_plugin_service_filter.cc	View	6 chunks	+81 lines, -19 lines	0 comments	Download
M	chrome/browser/content_settings/content_settings_browsertest.cc	View	6 chunks	+15 lines, -0 lines	0 comments	Download
M	chrome/browser/plugins/plugin_infobar_delegates.cc	View	3 chunks	+7 lines, -2 lines	0 comments	Download
M	chrome/browser/renderer_host/plugin_info_message_filter.h	View	1 chunk	+2 lines, -0 lines	0 comments	Download
M	chrome/browser/renderer_host/plugin_info_message_filter.cc	View	4 chunks	+15 lines, -1 line	0 comments	Download
M	chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc	View	3 chunks	+10 lines, -2 lines	0 comments	Download
M	chrome/browser/tab_contents/render_view_context_menu.cc	View	3 chunks	+10 lines, -1 line	0 comments	Download
M	chrome/browser/ui/content_settings/content_setting_bubble_model.cc	View	3 chunks	+6 lines, -0 lines	0 comments	Download
MM	content/browser/pepper_flash_settings_helper_impl.cc	View	1 chunk	+1 line, -1 line	0 comments	Download
M	content/browser/plugin_data_remover_impl.cc	View	1 chunk	+1 line, -1 line	0 comments	Download
M	content/browser/plugin_service_impl.h	View	3 chunks	+10 lines, -7 lines	0 comments	Download
M	content/browser/plugin_service_impl.cc	View	8 chunks	+25 lines, -5 lines	0 comments	Download
M	content/browser/plugin_service_impl_browsertest.cc	View	6 chunks	+37 lines, -4 lines	0 comments	Download
M	content/browser/renderer_host/render_message_filter.cc	View	3 chunks	+8 lines, -4 lines	0 comments	Download
M	content/public/browser/plugin_service_filter.h	View	1 chunk	+8 lines, -3 lines	0 comments	Download

Messages

Total messages: 2 (0 generated)

Expand Messages | Collapse Messages

Message was sent while issue was closed.

Committed patchset #1 manually as r183685.

Expand Messages | Collapse Messages