chrome/common/pref_names.h - 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

Unified Diff: chrome/common/pref_names.h

Issue 9537014: Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src

Patch Set: sync Created 8 years, 10 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

Index: chrome/common/pref_names.h

diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h

index 410dc29f4dc1e545fdcce6a481c0cdca968fa1dd..c8fbb8187f7af9a779ee7b6817e1c168b0395a08 100644

--- a/chrome/common/pref_names.h

+++ b/chrome/common/pref_names.h

@@ -291,6 +291,8 @@ extern const char kPerHostContentSettings[]; // OBSOLETE

extern const char kContentSettingsVersion[];

extern const char kContentSettingsPatterns[]; // OBSOLETE

extern const char kContentSettingsPatternPairs[];

+extern const char kContentSettingsDefaultWhitelistVersion[];

+extern const char kContentSettingsPluginWhitelist[];

extern const char kBlockThirdPartyCookies[];

extern const char kClearSiteDataOnExit[];

extern const char kDefaultZoomLevel[];

« no previous file with comments | « chrome/browser/ui/webui/plugins_ui.cc ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »