chrome/browser/content_settings/content_settings_default_provider.cc - Issue 10826164: Add infobar for PPAPI broker usage.

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/browser/content_settings/content_settings_default_provider.cc

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix merge 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/browser/resources/options2/content_settings.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc

index aa17d29bdd2a892ed711189ef15bbd3de24c307d..28fd5cd674dd194ade9c0dd0c284349e07a0630f 100644

--- a/chrome/browser/content_settings/content_settings_default_provider.cc

+++ b/chrome/browser/content_settings/content_settings_default_provider.cc

@@ -46,6 +46,7 @@ const ContentSetting kDefaultSettings[] = {

CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_MIXEDSCRIPT

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MEDIASTREAM

CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS

+ CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_PPAPI_BROKER

};

COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,

default_settings_incorrect_size);