From d71337daf8516256ca319e5922a37763da149c16 Mon Sep 17 00:00:00 2001 From: "sammc@chromium.org" Date: Mon, 28 Jul 2014 04:39:26 +0000 Subject: [PATCH] Move the serial api and permission features to extensions/. BUG=389016 Review URL: https://codereview.chromium.org/420713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285861 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 3 --- .../views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc | 1 + chrome/common/extensions/api/_api_features.json | 4 ---- chrome/common/extensions/api/_permission_features.json | 4 ---- chrome/common/extensions/permissions/chrome_api_permissions.cc | 2 -- extensions/common/api/_api_features.json | 4 ++++ extensions/common/api/_permission_features.json | 4 ++++ extensions/common/permissions/extensions_api_permissions.cc | 2 ++ extensions/extensions_strings.grd | 3 +++ 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ef981e83c859..037edd204620 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4459,9 +4459,6 @@ Make sure you do not expose any sensitive information. Read, change and delete photos, music, and other media from your computer - - Access your serial devices - Store data in your Google Drive account diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc index a4d82961165e..586c2484981d 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc @@ -16,6 +16,7 @@ #include "extensions/common/manifest.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" +#include "grit/extensions_strings.h" #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock-matchers.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json index 0caf57d8f297..1482a2b63491 100644 --- a/chrome/common/extensions/api/_api_features.json +++ b/chrome/common/extensions/api/_api_features.json @@ -614,10 +614,6 @@ "dependencies": ["manifest:script_badge"], "contexts": ["blessed_extension"] }, - "serial": { - "dependencies": ["permission:serial"], - "contexts": ["blessed_extension"] - }, "sessions": { "dependencies": ["permission:sessions"], "contexts": ["blessed_extension"] diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json index e5b9920a21a9..76a35c706571 100644 --- a/chrome/common/extensions/api/_permission_features.json +++ b/chrome/common/extensions/api/_permission_features.json @@ -914,10 +914,6 @@ "channel": "stable", "extension_types": ["legacy_packaged_app", "hosted_app", "platform_app"] }, - "serial": { - "channel": "stable", - "extension_types": ["platform_app"] - }, "sessions": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app"] diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index d9e7c026f56e..999a6eb85d58 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc @@ -287,8 +287,6 @@ std::vector ChromeAPIPermissions::GetAllPermissions() APIPermissionInfo::kFlagCannotBeOptional}, // Platform-app permissions. - {APIPermission::kSerial, "serial", APIPermissionInfo::kFlagNone, - IDS_EXTENSION_PROMPT_WARNING_SERIAL, PermissionMessage::kSerial}, {APIPermission::kAlwaysOnTopWindows, "app.window.alwaysOnTop"}, {APIPermission::kAudioCapture, "audioCapture", APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE, diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json index caa8df1a6430..fbabf2907f57 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json @@ -98,6 +98,10 @@ "runtime.setUninstallURL": { "channel": "dev" }, + "serial": { + "dependencies": ["permission:serial"], + "contexts": ["blessed_extension"] + }, "socket": { "dependencies": ["permission:socket"], "contexts": ["blessed_extension"] diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json index 952bcd317e09..483a2d80d16b 100644 --- a/extensions/common/api/_permission_features.json +++ b/extensions/common/api/_permission_features.json @@ -60,6 +60,10 @@ "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"] }, + "serial": { + "channel": "stable", + "extension_types": ["platform_app"] + }, "socket": [ { "channel": "stable", diff --git a/extensions/common/permissions/extensions_api_permissions.cc b/extensions/common/permissions/extensions_api_permissions.cc index 03da5f0e2579..4d8a942d1a24 100644 --- a/extensions/common/permissions/extensions_api_permissions.cc +++ b/extensions/common/permissions/extensions_api_permissions.cc @@ -28,6 +28,8 @@ std::vector ExtensionsAPIPermissions::GetAllPermissions() {APIPermission::kHid, "hid", APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_HID, PermissionMessage::kHid}, {APIPermission::kPower, "power"}, + {APIPermission::kSerial, "serial", APIPermissionInfo::kFlagNone, + IDS_EXTENSION_PROMPT_WARNING_SERIAL, PermissionMessage::kSerial}, // Because warning messages for the "socket" permission vary based // on the permissions parameters, no message ID or message text is // specified here. The message ID and text used will be diff --git a/extensions/extensions_strings.grd b/extensions/extensions_strings.grd index 0fce6cbc10b7..e325892387c5 100644 --- a/extensions/extensions_strings.grd +++ b/extensions/extensions_strings.grd @@ -268,6 +268,9 @@ Access your input devices + + Access your serial devices + Access your USB devices -- 2.11.4.GIT