Issue 9537014: Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

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 9537014: Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play. (Closed)

Created:
8 years, 9 months ago by Bernhard Bauer

Modified:
8 years, 9 months ago

Reviewers:

CC:
chromium-reviews, arv (Not doing code reviews), darin-cc_chromium.org

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

Visibility:
Public.

More Reviews

Description

Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play. * 124177 - Apply plugin whitelisting only when turning on click-to-play (i.e. not block). * 124178 - Don't infobar pdf viewer and google talk plugin. * 123751 - Whitelist Google Talk plug-in when turning on click-to-play. * 122816 - Add per-plugin whitelisting to chrome://plugins BUG=115472 TEST=yesplz Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=124507

Patch Set 1 #

Patch Set 2 : cleanup #

Patch Set 3 : sync #

Patch Set 4 : fix merge #

Patch Set 5 : strings #

Patch Set 6 : sync #

Created: 8 years, 9 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+246 lines, -56 lines)			Patch
M	chrome/browser/content_settings/content_settings_pref_provider.cc	View		6 chunks	+24 lines, -24 lines	0 comments	Download
M	chrome/browser/content_settings/host_content_settings_map.cc	View	1 2 3 4 5	1 chunk	+2 lines, -0 lines	0 comments	Download
M	chrome/browser/resources/plugins.css	View		2 chunks	+5 lines, -1 line	0 comments	Download
M	chrome/browser/resources/plugins.html	View		1 chunk	+6 lines, -0 lines	0 comments	Download
M	chrome/browser/resources/plugins.js	View		3 chunks	+15 lines, -5 lines	0 comments	Download
M	chrome/browser/ui/webui/options/content_settings_handler.h	View		3 chunks	+6 lines, -1 line	0 comments	Download
M	chrome/browser/ui/webui/options/content_settings_handler.cc	View	1 2 3 4 5	3 chunks	+31 lines, -2 lines	0 comments	Download
M	chrome/browser/ui/webui/options2/content_settings_handler2.h	View		3 chunks	+6 lines, -1 line	0 comments	Download
M	chrome/browser/ui/webui/options2/content_settings_handler2.cc	View	1 2 3 4 5	3 chunks	+31 lines, -2 lines	0 comments	Download
M	chrome/browser/ui/webui/plugins_ui.cc	View	1 2 3 4	13 chunks	+74 lines, -7 lines	0 comments	Download
M	chrome/common/pref_names.h	View		1 chunk	+2 lines, -0 lines	0 comments	Download
M	chrome/common/pref_names.cc	View		1 chunk	+8 lines, -0 lines	0 comments	Download
M	webkit/plugins/npapi/plugin_list.cc	View	1 2 3	6 chunks	+36 lines, -13 lines	0 comments	Download