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

Side by Side Diff: extensions/common/permissions/extensions_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
« no previous file with comments | « extensions/common/extension_api.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "extensions/common/permissions/extensions_api_permissions.h" 5 #include "extensions/common/permissions/extensions_api_permissions.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "extensions/common/permissions/api_permission.h" 9 #include "extensions/common/permissions/api_permission.h"
10 #include "extensions/common/permissions/permission_message.h" 10 #include "extensions/common/permissions/permission_message.h"
(...skipping 17 matching lines...) Expand all
28 } // namespace 28 } // namespace
29 29
30 std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions() 30 std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
31 const { 31 const {
32 APIPermissionInfo::InitInfo permissions_to_register[] = { 32 APIPermissionInfo::InitInfo permissions_to_register[] = {
33 {APIPermission::kAlphaEnabled, "app.window.alpha"}, 33 {APIPermission::kAlphaEnabled, "app.window.alpha"},
34 {APIPermission::kAlwaysOnTopWindows, "app.window.alwaysOnTop"}, 34 {APIPermission::kAlwaysOnTopWindows, "app.window.alwaysOnTop"},
35 {APIPermission::kAudioCapture, "audioCapture", 35 {APIPermission::kAudioCapture, "audioCapture",
36 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE, 36 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
37 PermissionMessage::kAudioCapture}, 37 PermissionMessage::kAudioCapture},
38 {APIPermission::kDeclarativeWebRequest, "declarativeWebRequest",
39 APIPermissionInfo::kFlagNone,
40 IDS_EXTENSION_PROMPT_WARNING_DECLARATIVE_WEB_REQUEST,
41 PermissionMessage::kDeclarativeWebRequest},
42 {APIPermission::kDns, "dns"}, 38 {APIPermission::kDns, "dns"},
43 {APIPermission::kExternallyConnectableAllUrls, 39 {APIPermission::kExternallyConnectableAllUrls,
44 "externally_connectable.all_urls"}, 40 "externally_connectable.all_urls"},
45 {APIPermission::kFullscreen, "app.window.fullscreen"}, 41 {APIPermission::kFullscreen, "app.window.fullscreen"},
46 {APIPermission::kHid, "hid", APIPermissionInfo::kFlagNone, 42 {APIPermission::kHid, "hid", APIPermissionInfo::kFlagNone,
47 IDS_EXTENSION_PROMPT_WARNING_HID, PermissionMessage::kHid}, 43 IDS_EXTENSION_PROMPT_WARNING_HID, PermissionMessage::kHid},
48 {APIPermission::kOverrideEscFullscreen, 44 {APIPermission::kOverrideEscFullscreen,
49 "app.window.fullscreen.overrideEsc"}, 45 "app.window.fullscreen.overrideEsc"},
50 {APIPermission::kPower, "power"}, 46 {APIPermission::kPower, "power"},
51 {APIPermission::kSerial, "serial", APIPermissionInfo::kFlagNone, 47 {APIPermission::kSerial, "serial", APIPermissionInfo::kFlagNone,
(...skipping 22 matching lines...) Expand all
74 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE, 70 APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
75 PermissionMessage::kVideoCapture}, 71 PermissionMessage::kVideoCapture},
76 // NOTE(kalman): This is provided by a manifest property but needs to 72 // NOTE(kalman): This is provided by a manifest property but needs to
77 // appear in the install permission dialogue, so we need a fake 73 // appear in the install permission dialogue, so we need a fake
78 // permission for it. See http://crbug.com/247857. 74 // permission for it. See http://crbug.com/247857.
79 {APIPermission::kWebConnectable, "webConnectable", 75 {APIPermission::kWebConnectable, "webConnectable",
80 APIPermissionInfo::kFlagCannotBeOptional | 76 APIPermissionInfo::kFlagCannotBeOptional |
81 APIPermissionInfo::kFlagInternal, 77 APIPermissionInfo::kFlagInternal,
82 IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE, 78 IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE,
83 PermissionMessage::kWebConnectable}, 79 PermissionMessage::kWebConnectable},
84 {APIPermission::kWebRequest, "webRequest"},
85 {APIPermission::kWebRequestBlocking, "webRequestBlocking"},
86 {APIPermission::kWebView, "webview", 80 {APIPermission::kWebView, "webview",
87 APIPermissionInfo::kFlagCannotBeOptional}, 81 APIPermissionInfo::kFlagCannotBeOptional},
88 {APIPermission::kWindowShape, "app.window.shape"}, 82 {APIPermission::kWindowShape, "app.window.shape"},
89 {APIPermission::kImeWindowEnabled, "app.window.ime"}, 83 {APIPermission::kImeWindowEnabled, "app.window.ime"},
90 }; 84 };
91 85
92 std::vector<APIPermissionInfo*> permissions; 86 std::vector<APIPermissionInfo*> permissions;
93 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(permissions_to_register); ++i) 87 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(permissions_to_register); ++i)
94 permissions.push_back(new APIPermissionInfo(permissions_to_register[i])); 88 permissions.push_back(new APIPermissionInfo(permissions_to_register[i]));
95 return permissions; 89 return permissions;
96 } 90 }
97 91
98 std::vector<PermissionsProvider::AliasInfo> 92 std::vector<PermissionsProvider::AliasInfo>
99 ExtensionsAPIPermissions::GetAllAliases() const { 93 ExtensionsAPIPermissions::GetAllAliases() const {
100 std::vector<PermissionsProvider::AliasInfo> aliases; 94 std::vector<PermissionsProvider::AliasInfo> aliases;
101 aliases.push_back(PermissionsProvider::AliasInfo( 95 aliases.push_back(PermissionsProvider::AliasInfo(
102 "app.window.alwaysOnTop", kOldAlwaysOnTopWindowsPermission)); 96 "app.window.alwaysOnTop", kOldAlwaysOnTopWindowsPermission));
103 aliases.push_back(PermissionsProvider::AliasInfo("app.window.fullscreen", 97 aliases.push_back(PermissionsProvider::AliasInfo("app.window.fullscreen",
104 kOldFullscreenPermission)); 98 kOldFullscreenPermission));
105 aliases.push_back( 99 aliases.push_back(
106 PermissionsProvider::AliasInfo("app.window.fullscreen.overrideEsc", 100 PermissionsProvider::AliasInfo("app.window.fullscreen.overrideEsc",
107 kOldOverrideEscFullscreenPermission)); 101 kOldOverrideEscFullscreenPermission));
108 return aliases; 102 return aliases;
109 } 103 }
110 104
111 } // namespace extensions 105 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/common/extension_api.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698