Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/extensions/permissions/api_permission.h" 5 #include "chrome/common/extensions/permissions/api_permission.h"
6 6
7 #include "chrome/common/extensions/permissions/permissions_info.h" 7 #include "chrome/common/extensions/permissions/permissions_info.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 10
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 { kTab, "tabs", kFlagNone, 110 { kTab, "tabs", kFlagNone,
111 IDS_EXTENSION_PROMPT_WARNING_TABS, 111 IDS_EXTENSION_PROMPT_WARNING_TABS,
112 PermissionMessage::kTabs }, 112 PermissionMessage::kTabs },
113 { kTopSites, "topSites", kFlagNone, 113 { kTopSites, "topSites", kFlagNone,
114 IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY, 114 IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY,
115 PermissionMessage::kBrowsingHistory }, 115 PermissionMessage::kBrowsingHistory },
116 { kTts, "tts", 0, kFlagCannotBeOptional }, 116 { kTts, "tts", 0, kFlagCannotBeOptional },
117 { kTtsEngine, "ttsEngine", kFlagCannotBeOptional, 117 { kTtsEngine, "ttsEngine", kFlagCannotBeOptional,
118 IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE, 118 IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE,
119 PermissionMessage::kTtsEngine }, 119 PermissionMessage::kTtsEngine },
120 { kUsb, "usb", kFlagNone,
121 IDS_EXTENSION_PROMPT_WARNING_USB,
122 PermissionMessage::kNone },
123 { kWebNavigation, "webNavigation", kFlagNone, 120 { kWebNavigation, "webNavigation", kFlagNone,
124 IDS_EXTENSION_PROMPT_WARNING_TABS, PermissionMessage::kTabs }, 121 IDS_EXTENSION_PROMPT_WARNING_TABS, PermissionMessage::kTabs },
125 { kWebRequest, "webRequest" }, 122 { kWebRequest, "webRequest" },
126 { kWebRequestBlocking, "webRequestBlocking" }, 123 { kWebRequestBlocking, "webRequestBlocking" },
127 124
128 // Register private permissions. 125 // Register private permissions.
129 { kChromeosInfoPrivate, "chromeosInfoPrivate", kFlagCannotBeOptional }, 126 { kChromeosInfoPrivate, "chromeosInfoPrivate", kFlagCannotBeOptional },
130 { kFileBrowserHandlerInternal, "fileBrowserHandlerInternal", 127 { kFileBrowserHandlerInternal, "fileBrowserHandlerInternal",
131 kFlagCannotBeOptional }, 128 kFlagCannotBeOptional },
132 { kFileBrowserPrivate, "fileBrowserPrivate", kFlagCannotBeOptional }, 129 { kFileBrowserPrivate, "fileBrowserPrivate", kFlagCannotBeOptional },
(...skipping 17 matching lines...) Expand all
150 PermissionMessage::kDebugger }, 147 PermissionMessage::kDebugger },
151 { kDevtools, "devtools", 148 { kDevtools, "devtools",
152 kFlagImpliesFullURLAccess | kFlagCannotBeOptional }, 149 kFlagImpliesFullURLAccess | kFlagCannotBeOptional },
153 { kPlugin, "plugin", 150 { kPlugin, "plugin",
154 kFlagImpliesFullURLAccess | kFlagImpliesFullAccess | 151 kFlagImpliesFullURLAccess | kFlagImpliesFullAccess |
155 kFlagCannotBeOptional, 152 kFlagCannotBeOptional,
156 IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS, 153 IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS,
157 PermissionMessage::kFullAccess }, 154 PermissionMessage::kFullAccess },
158 155
159 // Platform-app permissions. 156 // Platform-app permissions.
157 { kSerial, "serial", kFlagCannotBeOptional },
160 { kSocket, "socket", kFlagCannotBeOptional }, 158 { kSocket, "socket", kFlagCannotBeOptional },
161 { kAppWindow, "app.window" }, 159 { kAppWindow, "app.window" },
162 { kAudioCapture, "audioCapture", kFlagNone, 160 { kAudioCapture, "audioCapture", kFlagNone,
163 IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE, 161 IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
164 PermissionMessage::kAudioCapture }, 162 PermissionMessage::kAudioCapture },
165 { kVideoCapture, "videoCapture", kFlagNone, 163 { kVideoCapture, "videoCapture", kFlagNone,
166 IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE, 164 IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
167 PermissionMessage::kVideoCapture }, 165 PermissionMessage::kVideoCapture },
168 // "fileSystem" has no permission string because read-only access is only 166 // "fileSystem" has no permission string because read-only access is only
169 // granted after the user has been shown a file chooser dialog and selected 167 // granted after the user has been shown a file chooser dialog and selected
(...skipping 18 matching lines...) Expand all
188 186
189 // Register aliases. 187 // Register aliases.
190 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission); 188 info->RegisterAlias("unlimitedStorage", kOldUnlimitedStoragePermission);
191 info->RegisterAlias("tabs", kWindowsPermission); 189 info->RegisterAlias("tabs", kWindowsPermission);
192 // TODO(mihaip): Should be removed for the M20 branch, see 190 // TODO(mihaip): Should be removed for the M20 branch, see
193 // http://crbug.com/120447 for more details. 191 // http://crbug.com/120447 for more details.
194 info->RegisterAlias("background", kTemporaryBackgroundAlias); 192 info->RegisterAlias("background", kTemporaryBackgroundAlias);
195 } 193 }
196 194
197 } // namespace extensions 195 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/permissions/api_permission.h ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698