Issue 8356010: Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

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 8356010: Merge 106270 - Check for default content settings when requiring user authorization for plug-ins. (Closed)

Created:
9 years, 2 months ago by Bernhard Bauer

Modified:
9 years, 2 months ago

Reviewers:

CC:
chromium-reviews, Avi (use Gerrit), creis+watch_chromium.org, Erik does not do reviews, Paweł Hajdan Jr., mihaip+watch_chromium.org, Aaron Boodman, darin-cc_chromium.org, brettw-cc_chromium.org, ajwong+watch_chromium.org

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

Visibility:
Public.

Description

Merge 106270 - Check for default content settings when requiring user authorization for plug-ins. We now check in the renderer if a plug-in is allowed by default, which is the case if the matching patterns are wildcards. BUG=100581 TEST=see bug Review URL: http://codereview.chromium.org/8334020 Conflicts: chrome/browser/content_settings/host_content_settings_map.cc Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106341

Patch Set 1 #

Patch Set 2 : fix #

Created: 9 years, 2 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+260 lines, -189 lines)			Patch
M	chrome/browser/content_settings/content_settings_default_provider.cc	View	1	1 chunk	+10 lines, -10 lines	0 comments	Download
M	chrome/browser/content_settings/content_settings_utils.h	View		1 chunk	+12 lines, -5 lines	0 comments	Download
M	chrome/browser/content_settings/content_settings_utils.cc	View		1 chunk	+46 lines, -46 lines	0 comments	Download
M	chrome/browser/content_settings/host_content_settings_map.h	View		1 chunk	+18 lines, -12 lines	0 comments	Download
M	chrome/browser/content_settings/host_content_settings_map.cc	View	1	1 chunk	+18 lines, -38 lines	0 comments	Download
M	chrome/browser/extensions/extension_content_settings_store_unittest.cc	View		1 chunk	+4 lines, -2 lines	0 comments	Download
M	chrome/browser/renderer_host/chrome_render_message_filter.h	View		2 chunks	+4 lines, -1 line	0 comments	Download
M	chrome/browser/renderer_host/chrome_render_message_filter.cc	View		2 chunks	+13 lines, -6 lines	0 comments	Download
M	chrome/browser/tab_contents/tab_contents_ssl_helper.cc	View	1	1 chunk	+17 lines, -13 lines	0 comments	Download
M	chrome/common/content_settings_pattern.h	View		5 chunks	+44 lines, -35 lines	0 comments	Download
M	chrome/common/content_settings_pattern.cc	View		2 chunks	+13 lines, -0 lines	0 comments	Download
M	chrome/common/render_messages.h	View		4 chunks	+23 lines, -2 lines	0 comments	Download
M	chrome/common/render_messages.cc	View		1 chunk	+17 lines, -0 lines	0 comments	Download
M	chrome/renderer/chrome_content_renderer_client.cc	View		4 chunks	+11 lines, -7 lines	0 comments	Download
M	chrome/renderer/content_settings_observer.h	View		1 chunk	+4 lines, -0 lines	0 comments	Download
M	chrome/renderer/content_settings_observer.cc	View		1 chunk	+2 lines, -4 lines	0 comments	Download
M	chrome/renderer/content_settings_observer_browsertest.cc	View		1 chunk	+4 lines, -8 lines	0 comments	Download