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

Side by Side Diff: chrome/common/extensions/permissions/chrome_api_permissions.cc

Issue 620623002: Revert "Allow declarative webrequest and webrequest in extensions." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chrome_api_permissions.h" 5 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
6 6
7 #include "chrome/grit/generated_resources.h" 7 #include "chrome/grit/generated_resources.h"
8 #include "extensions/common/permissions/api_permission.h" 8 #include "extensions/common/permissions/api_permission.h"
9 #include "extensions/common/permissions/api_permission_set.h" 9 #include "extensions/common/permissions/api_permission_set.h"
10 #include "extensions/common/permissions/media_galleries_permission.h" 10 #include "extensions/common/permissions/media_galleries_permission.h"
(...skipping 20 matching lines...) Expand all
31 APIPermissionInfo::InitInfo permissions_to_register[] = { 31 APIPermissionInfo::InitInfo permissions_to_register[] = {
32 // Register permissions for all extension types. 32 // Register permissions for all extension types.
33 {APIPermission::kAppView, "appview", 33 {APIPermission::kAppView, "appview",
34 APIPermissionInfo::kFlagCannotBeOptional}, 34 APIPermissionInfo::kFlagCannotBeOptional},
35 {APIPermission::kBackground, "background"}, 35 {APIPermission::kBackground, "background"},
36 {APIPermission::kClipboardRead, "clipboardRead", 36 {APIPermission::kClipboardRead, "clipboardRead",
37 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD, 37 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD,
38 PermissionMessage::kClipboard}, 38 PermissionMessage::kClipboard},
39 {APIPermission::kClipboardWrite, "clipboardWrite"}, 39 {APIPermission::kClipboardWrite, "clipboardWrite"},
40 {APIPermission::kDeclarativeContent, "declarativeContent"}, 40 {APIPermission::kDeclarativeContent, "declarativeContent"},
41 {APIPermission::kDeclarativeWebRequest, "declarativeWebRequest",
42 APIPermissionInfo::kFlagNone,
43 IDS_EXTENSION_PROMPT_WARNING_DECLARATIVE_WEB_REQUEST,
44 PermissionMessage::kDeclarativeWebRequest},
41 {APIPermission::kDesktopCapture, "desktopCapture", 45 {APIPermission::kDesktopCapture, "desktopCapture",
42 APIPermissionInfo::kFlagNone, 46 APIPermissionInfo::kFlagNone,
43 IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE, 47 IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE,
44 PermissionMessage::kDesktopCapture}, 48 PermissionMessage::kDesktopCapture},
45 {APIPermission::kDownloads, "downloads", APIPermissionInfo::kFlagNone, 49 {APIPermission::kDownloads, "downloads", APIPermissionInfo::kFlagNone,
46 IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS, PermissionMessage::kDownloads}, 50 IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS, PermissionMessage::kDownloads},
47 {APIPermission::kDownloadsOpen, "downloads.open", 51 {APIPermission::kDownloadsOpen, "downloads.open",
48 APIPermissionInfo::kFlagNone, 52 APIPermissionInfo::kFlagNone,
49 IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS_OPEN, 53 IDS_EXTENSION_PROMPT_WARNING_DOWNLOADS_OPEN,
50 PermissionMessage::kDownloadsOpen}, 54 PermissionMessage::kDownloadsOpen},
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 {APIPermission::kTts, "tts", 0, APIPermissionInfo::kFlagCannotBeOptional}, 144 {APIPermission::kTts, "tts", 0, APIPermissionInfo::kFlagCannotBeOptional},
141 {APIPermission::kTtsEngine, "ttsEngine", 145 {APIPermission::kTtsEngine, "ttsEngine",
142 APIPermissionInfo::kFlagCannotBeOptional, 146 APIPermissionInfo::kFlagCannotBeOptional,
143 IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE, PermissionMessage::kTtsEngine}, 147 IDS_EXTENSION_PROMPT_WARNING_TTS_ENGINE, PermissionMessage::kTtsEngine},
144 {APIPermission::kWallpaper, "wallpaper", 148 {APIPermission::kWallpaper, "wallpaper",
145 APIPermissionInfo::kFlagCannotBeOptional, 149 APIPermissionInfo::kFlagCannotBeOptional,
146 IDS_EXTENSION_PROMPT_WARNING_WALLPAPER, PermissionMessage::kWallpaper}, 150 IDS_EXTENSION_PROMPT_WARNING_WALLPAPER, PermissionMessage::kWallpaper},
147 {APIPermission::kWebNavigation, "webNavigation", 151 {APIPermission::kWebNavigation, "webNavigation",
148 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ, 152 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ,
149 PermissionMessage::kTabs}, 153 PermissionMessage::kTabs},
154 {APIPermission::kWebRequest, "webRequest"},
155 {APIPermission::kWebRequestBlocking, "webRequestBlocking"},
150 156
151 // Register private permissions. 157 // Register private permissions.
152 {APIPermission::kScreenlockPrivate, "screenlockPrivate", 158 {APIPermission::kScreenlockPrivate, "screenlockPrivate",
153 APIPermissionInfo::kFlagCannotBeOptional, 159 APIPermissionInfo::kFlagCannotBeOptional,
154 IDS_EXTENSION_PROMPT_WARNING_SCREENLOCK_PRIVATE, 160 IDS_EXTENSION_PROMPT_WARNING_SCREENLOCK_PRIVATE,
155 PermissionMessage::kScreenlockPrivate}, 161 PermissionMessage::kScreenlockPrivate},
156 {APIPermission::kActivityLogPrivate, "activityLogPrivate", 162 {APIPermission::kActivityLogPrivate, "activityLogPrivate",
157 APIPermissionInfo::kFlagCannotBeOptional, 163 APIPermissionInfo::kFlagCannotBeOptional,
158 IDS_EXTENSION_PROMPT_WARNING_ACTIVITY_LOG_PRIVATE, 164 IDS_EXTENSION_PROMPT_WARNING_ACTIVITY_LOG_PRIVATE,
159 PermissionMessage::kActivityLogPrivate}, 165 PermissionMessage::kActivityLogPrivate},
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 // Register aliases. 346 // Register aliases.
341 std::vector<PermissionsProvider::AliasInfo> aliases; 347 std::vector<PermissionsProvider::AliasInfo> aliases;
342 aliases.push_back(PermissionsProvider::AliasInfo( 348 aliases.push_back(PermissionsProvider::AliasInfo(
343 "unlimitedStorage", kOldUnlimitedStoragePermission)); 349 "unlimitedStorage", kOldUnlimitedStoragePermission));
344 aliases.push_back(PermissionsProvider::AliasInfo( 350 aliases.push_back(PermissionsProvider::AliasInfo(
345 "tabs", kWindowsPermission)); 351 "tabs", kWindowsPermission));
346 return aliases; 352 return aliases;
347 } 353 }
348 354
349 } // namespace extensions 355 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/chrome_extensions_client.cc ('k') | chrome/common/extensions_api_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698