chrome/common/extensions/permissions/api_permission.cc - Issue 10852016: Move serial 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/permissions/api_permission.cc

Issue 10852016: Move serial out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Resolve merge conflicts. 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:

Index: chrome/common/extensions/permissions/api_permission.cc

diff --git a/chrome/common/extensions/permissions/api_permission.cc b/chrome/common/extensions/permissions/api_permission.cc

index 30ceeaf253f96d339e83fc741ab3a576e26fac15..884260b36a13e177d437c86c0b6a299ef246b924 100644

--- a/chrome/common/extensions/permissions/api_permission.cc

+++ b/chrome/common/extensions/permissions/api_permission.cc

@@ -117,9 +117,6 @@ void APIPermission::RegisterAllPermissions(

{ kTtsEngine, "ttsEngine", kFlagCannotBeOptional,

IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE,

PermissionMessage::kTtsEngine },

- { kUsb, "usb", kFlagNone,

- IDS_EXTENSION_PROMPT_WARNING_USB,

- PermissionMessage::kNone },

{ kWebNavigation, "webNavigation", kFlagNone,

IDS_EXTENSION_PROMPT_WARNING_TABS, PermissionMessage::kTabs },

{ kWebRequest, "webRequest" },

@@ -157,6 +154,7 @@ void APIPermission::RegisterAllPermissions(

PermissionMessage::kFullAccess },

// Platform-app permissions.

+ { kSerial, "serial", kFlagCannotBeOptional },

{ kSocket, "socket", kFlagCannotBeOptional },

{ kAppWindow, "app.window" },

{ kAudioCapture, "audioCapture", kFlagNone,