chrome/common/extensions/extension_permission_set.cc - Issue 8071025: Move contentSettings extension API out of experimental

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/extensions/extension_permission_set.cc

Issue 8071025: Move contentSettings extension API out of experimental (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 years, 2 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:

Index: chrome/common/extensions/extension_permission_set.cc

diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc

index 4f66c94db3e43b9719d963c384dd0d1ab5cd96dd..417da8f2264fce4e12da465b6195005198dad971 100644

--- a/chrome/common/extensions/extension_permission_set.cc

+++ b/chrome/common/extensions/extension_permission_set.cc

@@ -271,8 +271,9 @@ ExtensionPermissionsInfo::ExtensionPermissionsInfo()

IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS,

ExtensionPermissionMessage::kBookmarks, optional);

RegisterPermission(

- ExtensionAPIPermission::kContentSettings, "contentSettings", 0,

- ExtensionPermissionMessage::kNone, none);

+ ExtensionAPIPermission::kContentSettings, "contentSettings",

+ IDS_EXTENSION_PROMPT_WARNING_CONTENT_SETTINGS,

+ ExtensionPermissionMessage::kContentSettings, none);

RegisterPermission(

ExtensionAPIPermission::kContextMenus, "contextMenus", 0,

ExtensionPermissionMessage::kNone, optional);