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

Unified Diff: extensions/common/permissions/extensions_api_permissions.cc

Issue 565423003: Move extensions manifest tests to run in extensions_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (manifest2) fix deps, android Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/common/manifest_handlers/file_handler_manifest_unittest.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/permissions/extensions_api_permissions.cc
diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc
index b4b2ddfceb74f2b7b964a56424b50bf7573a9543..efad143d916ec80b950eddec3faf2592f11cd405 100644
--- a/extensions/common/permissions/extensions_api_permissions.cc
+++ b/extensions/common/permissions/extensions_api_permissions.cc
@@ -4,6 +4,8 @@
#include "extensions/common/permissions/extensions_api_permissions.h"
+#include <vector>
+
#include "extensions/common/permissions/api_permission.h"
#include "extensions/common/permissions/permission_message.h"
#include "extensions/common/permissions/socket_permission.h"
@@ -65,6 +67,14 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
{APIPermission::kVideoCapture, "videoCapture",
APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
PermissionMessage::kVideoCapture},
+ // NOTE(kalman): This is provided by a manifest property but needs to
+ // appear in the install permission dialogue, so we need a fake
+ // permission for it. See http://crbug.com/247857.
+ {APIPermission::kWebConnectable, "webConnectable",
+ APIPermissionInfo::kFlagCannotBeOptional |
+ APIPermissionInfo::kFlagInternal,
+ IDS_EXTENSION_PROMPT_WARNING_WEB_CONNECTABLE,
+ PermissionMessage::kWebConnectable},
{APIPermission::kWebView, "webview",
APIPermissionInfo::kFlagCannotBeOptional},
{APIPermission::kWindowShape, "app.window.shape"},
« no previous file with comments | « extensions/common/manifest_handlers/file_handler_manifest_unittest.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698