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

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

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
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 3b21c61aecb2567f7f00c36f7dbc0690c6a2bd6b..36f38e9488359cfd88335869f1d3253e5bdd02df 100644
--- a/extensions/common/permissions/extensions_api_permissions.cc
+++ b/extensions/common/permissions/extensions_api_permissions.cc
@@ -9,7 +9,9 @@
#include "extensions/common/permissions/api_permission.h"
#include "extensions/common/permissions/permission_message.h"
#include "extensions/common/permissions/socket_permission.h"
+#if !defined(OS_ANDROID)
#include "extensions/common/permissions/usb_device_permission.h"
+#endif
#include "grit/extensions_strings.h"
namespace extensions {
@@ -130,12 +132,14 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
APIPermissionInfo::kFlagCannotBeOptional |
APIPermissionInfo::kFlagSupportsContentCapabilities},
{APIPermission::kUsb, "usb", APIPermissionInfo::kFlagNone},
+#if !defined(OS_ANDROID)
{APIPermission::kUsbDevice,
"usbDevices",
APIPermissionInfo::kFlagNone,
0,
PermissionMessage::kNone,
&CreateAPIPermission<UsbDevicePermission>},
+#endif
{APIPermission::kVideoCapture,
"videoCapture",
APIPermissionInfo::kFlagNone,

Powered by Google App Engine
This is Rietveld 408576698