Move app.window section of _api_features.json and _permission_features.json...

Move app.window section of _api_features.json and _permission_features.json from chrome/common/extensions/api to extensions/common/api

BUG=387288

Review URL: https://codereview.chromium.org/546683002

Cr-Commit-Position: refs/heads/master@{#294300}

chrome/common/extensions/api/_api_features.json

@@ -69,15 +69,6 @@
     "channel": "dev",
     "contexts": ["blessed_extension"]
   },
-  "app.window": {
-    "channel": "stable",
-    "contexts": ["blessed_extension"],
-    "extension_types": ["platform_app"],
-    "noparent": true
-  },
-  "app.window.canSetVisibleOnAllWorkspaces": {
-    "channel": "dev"
-  },
   "app.getDetails": {
     "contexts": ["blessed_extension", "unblessed_extension", "content_script"],
     "matches": []

chrome/common/extensions/api/_permission_features.json

@@ -60,86 +60,6 @@
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "min_manifest_version": 2
   },
-  "app.window.alwaysOnTop": {
-    "channel": "stable",
-    "extension_types": ["platform_app"]
-  },
-  "app.window.fullscreen": {
-    "channel": "stable",
-    "extension_types": ["platform_app"]
-  },
-  "app.window.fullscreen.overrideEsc": {
-    "channel": "stable",
-    "extension_types": ["platform_app"]
-  },
-  "app.window.alpha": [
-    {
-      "channel": "dev",
-      "extension_types": ["platform_app"]
-    },
-    {
-      "channel": "stable",
-      "extension_types": ["platform_app"],
-      "whitelist": [
-        "0F42756099D914A026DADFA182871C015735DD95",  // http://crbug.com/323773
-        "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",
-        "E7E2461CE072DF036CF9592740196159E2D7C089",  // http://crbug.com/356200
-        "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",
-        "312745D9BF916161191143F6490085EEA0434997",
-        "53041A2FA309EECED01FFC751E7399186E860B2C"
-      ]
-    }
-  ],
-  "app.window.shape": [
-    {
-      "channel": "dev",
-      "extension_types": ["platform_app"]
-    },
-    {
-      "channel": "stable",
-      "extension_types": ["platform_app"],
-      "whitelist": [
-        "0F42756099D914A026DADFA182871C015735DD95",  // http://crbug.com/323773
-        "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",
-        "E7E2461CE072DF036CF9592740196159E2D7C089",  // http://crbug.com/356200
-        "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",
-        "312745D9BF916161191143F6490085EEA0434997",
-        "53041A2FA309EECED01FFC751E7399186E860B2C",
-        "EBA908206905323CECE6DC4B276A58A0F4AC573F",
-        "2775E568AC98F9578791F1EAB65A1BF5F8CEF414",
-        "4AA3C5D69A4AECBD236CAD7884502209F0F5C169",
-        "E410CDAB2C6E6DD408D731016CECF2444000A912",
-        "9E930B2B5EABA6243AE6C710F126E54688E8FAF6",
-        "FAFE8EFDD2D6AE2EEB277AFEB91C870C79064D9E",  // http://crbug.com/327507
-        "3B52D273A271D4E2348233E322426DBAE854B567",
-        "5DF6ADC8708DF59FCFDDBF16AFBFB451380C2059",
-        "1037DEF5F6B06EA46153AD87B6C5C37440E3F2D1",
-        "F5815DAFEB8C53B078DD1853B2059E087C42F139",
-        "6A08EFFF9C16E090D6DCC7EC55A01CADAE840513",
-        "C32D6D93E12F5401DAA3A723E0C3CC5F25429BA4",  // http://crbug.com/354258
-        "9099782647D39C778E15C8C6E0D23C88F5CDE170",
-        "B7D5B52D1E5B106288BD7F278CAFA5E8D76108B0",
-        "89349DBAA2C4022FB244AA50182AB60934EB41EE",
-        "CB593E510640572A995CB1B6D41BD85ED51E63F8",
-        "1AD1AC86C87969CD3434FA08D99DBA6840AEA612",
-        "9C2EA21D7975BDF2B3C01C3A454EE44854067A6D",
-        "D2C488C80C3C90C3E01A991112A05E37831E17D0",
-        "6EEC061C0E74B46C7B5BE2EEFA49436368F4988F",
-        "8B344D9E8A4C505EF82A0DBBC25B8BD1F984E777",
-        "E06AFCB1EB0EFD237824CC4AC8FDD3D43E8BC868",
-        "F76F43EFFF56BF17A9868A5243F339BA28746632",  // http://crbug.com/386324
-        "C6EA52B92F80878515F94137020F01519357E5B5",
-        "E466389F058ABD73FF6FDD06F768A351FCBF8532",
-        "40063F1CF7B68BA847A26FA6620DDF156171D23C",
-        "A6FD8E15353CF1F5C3D0A7B20E1D10AEA4DD3E6A",
-        "57AC4D9E6BD8A2D0A70056B5FAC2378CAA588912",
-        "02037314DA4D913640DCF0E296A7D01F4FD793EC",
-        "B6EC0809BC63E10B431C5E4AA3645232CA86B2A5",
-        "48CA541313139786F056DBCB504A1025CFF5D2E3",
-        "05106136AE7F08A3C181D4648E5438350B1D2B4F"
-      ]
-    }
-  ],
   "audio": [
     {
       "channel": "dev",

chrome/common/extensions/permissions/chrome_api_permissions.cc

@@ -16,9 +16,6 @@ namespace extensions {
 
 namespace {
 
-const char kOldAlwaysOnTopWindowsPermission[] = "alwaysOnTopWindows";
-const char kOldFullscreenPermission[] = "fullscreen";
-const char kOldOverrideEscFullscreenPermission[] = "overrideEscFullscreen";
 const char kOldUnlimitedStoragePermission[] = "unlimited_storage";
 const char kWindowsPermission[] = "windows";
 
@@ -296,7 +293,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
            APIPermissionInfo::kFlagCannotBeOptional},
 
       // Platform-app permissions.
-      {APIPermission::kAlwaysOnTopWindows, "app.window.alwaysOnTop"},
+
       // The permission string for "fileSystem" is only shown when
       // "write" or "directory" is present. Read-only access is only
       // granted after the user has been shown a file or directory
@@ -325,13 +322,8 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
       {APIPermission::kPushMessaging, "pushMessaging",
        APIPermissionInfo::kFlagCannotBeOptional},
       {APIPermission::kPointerLock, "pointerLock"},
-      {APIPermission::kFullscreen, "app.window.fullscreen"},
       {APIPermission::kAudio, "audio"},
       {APIPermission::kCastStreaming, "cast.streaming"},
-      {APIPermission::kOverrideEscFullscreen,
-       "app.window.fullscreen.overrideEsc"},
-      {APIPermission::kWindowShape, "app.window.shape"},
-      {APIPermission::kAlphaEnabled, "app.window.alpha"},
       {APIPermission::kBrowser, "browser"},
 
       // Settings override permissions.
@@ -363,13 +355,6 @@ std::vector<PermissionsProvider::AliasInfo>
 ChromeAPIPermissions::GetAllAliases() const {
   // Register aliases.
   std::vector<PermissionsProvider::AliasInfo> aliases;
-  aliases.push_back(PermissionsProvider::AliasInfo(
-      "app.window.alwaysOnTop", kOldAlwaysOnTopWindowsPermission));
-  aliases.push_back(PermissionsProvider::AliasInfo("app.window.fullscreen",
-                                                   kOldFullscreenPermission));
-  aliases.push_back(
-      PermissionsProvider::AliasInfo("app.window.fullscreen.overrideEsc",
-                                     kOldOverrideEscFullscreenPermission));
   aliases.push_back(PermissionsProvider::AliasInfo(
       "unlimitedStorage", kOldUnlimitedStoragePermission));
   aliases.push_back(PermissionsProvider::AliasInfo(

extensions/common/api/_api_features.json

@@ -36,6 +36,15 @@
       "12E618C3C6E97495AAECF2AC12DEB082353241C6"   // QO component extension
     ]
   }],
+  "app.window": {
+    "channel": "stable",
+    "contexts": ["blessed_extension"],
+    "extension_types": ["platform_app"],
+    "noparent": true
+  },
+  "app.window.canSetVisibleOnAllWorkspaces": {
+    "channel": "dev"
+  },
   "app.currentWindowInternal": {
     "noparent": true,
     "internal": true,

extensions/common/api/_permission_features.json

@@ -21,6 +21,86 @@
 // chrome/test/data/extensions/api_test/stubs_app/manifest.json
 
 {
+  "app.window.alwaysOnTop": {
+    "channel": "stable",
+    "extension_types": ["platform_app"]
+  },
+  "app.window.fullscreen": {
+    "channel": "stable",
+    "extension_types": ["platform_app"]
+  },
+  "app.window.fullscreen.overrideEsc": {
+    "channel": "stable",
+    "extension_types": ["platform_app"]
+  },
+  "app.window.alpha": [
+    {
+      "channel": "dev",
+      "extension_types": ["platform_app"]
+    },
+    {
+      "channel": "stable",
+      "extension_types": ["platform_app"],
+      "whitelist": [
+        "0F42756099D914A026DADFA182871C015735DD95",  // http://crbug.com/323773
+        "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",
+        "E7E2461CE072DF036CF9592740196159E2D7C089",  // http://crbug.com/356200
+        "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",
+        "312745D9BF916161191143F6490085EEA0434997",
+        "53041A2FA309EECED01FFC751E7399186E860B2C"
+      ]
+    }
+  ],
+  "app.window.shape": [
+    {
+      "channel": "dev",
+      "extension_types": ["platform_app"]
+    },
+    {
+      "channel": "stable",
+      "extension_types": ["platform_app"],
+      "whitelist": [
+        "0F42756099D914A026DADFA182871C015735DD95",  // http://crbug.com/323773
+        "2D22CDB6583FD0A13758AEBE8B15E45208B4E9A7",
+        "E7E2461CE072DF036CF9592740196159E2D7C089",  // http://crbug.com/356200
+        "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",
+        "312745D9BF916161191143F6490085EEA0434997",
+        "53041A2FA309EECED01FFC751E7399186E860B2C",
+        "EBA908206905323CECE6DC4B276A58A0F4AC573F",
+        "2775E568AC98F9578791F1EAB65A1BF5F8CEF414",
+        "4AA3C5D69A4AECBD236CAD7884502209F0F5C169",
+        "E410CDAB2C6E6DD408D731016CECF2444000A912",
+        "9E930B2B5EABA6243AE6C710F126E54688E8FAF6",
+        "FAFE8EFDD2D6AE2EEB277AFEB91C870C79064D9E",  // http://crbug.com/327507
+        "3B52D273A271D4E2348233E322426DBAE854B567",
+        "5DF6ADC8708DF59FCFDDBF16AFBFB451380C2059",
+        "1037DEF5F6B06EA46153AD87B6C5C37440E3F2D1",
+        "F5815DAFEB8C53B078DD1853B2059E087C42F139",
+        "6A08EFFF9C16E090D6DCC7EC55A01CADAE840513",
+        "C32D6D93E12F5401DAA3A723E0C3CC5F25429BA4",  // http://crbug.com/354258
+        "9099782647D39C778E15C8C6E0D23C88F5CDE170",
+        "B7D5B52D1E5B106288BD7F278CAFA5E8D76108B0",
+        "89349DBAA2C4022FB244AA50182AB60934EB41EE",
+        "CB593E510640572A995CB1B6D41BD85ED51E63F8",
+        "1AD1AC86C87969CD3434FA08D99DBA6840AEA612",
+        "9C2EA21D7975BDF2B3C01C3A454EE44854067A6D",
+        "D2C488C80C3C90C3E01A991112A05E37831E17D0",
+        "6EEC061C0E74B46C7B5BE2EEFA49436368F4988F",
+        "8B344D9E8A4C505EF82A0DBBC25B8BD1F984E777",
+        "E06AFCB1EB0EFD237824CC4AC8FDD3D43E8BC868",
+        "F76F43EFFF56BF17A9868A5243F339BA28746632",  // http://crbug.com/386324
+        "C6EA52B92F80878515F94137020F01519357E5B5",
+        "E466389F058ABD73FF6FDD06F768A351FCBF8532",
+        "40063F1CF7B68BA847A26FA6620DDF156171D23C",
+        "A6FD8E15353CF1F5C3D0A7B20E1D10AEA4DD3E6A",
+        "57AC4D9E6BD8A2D0A70056B5FAC2378CAA588912",
+        "02037314DA4D913640DCF0E296A7D01F4FD793EC",
+        "B6EC0809BC63E10B431C5E4AA3645232CA86B2A5",
+        "48CA541313139786F056DBCB504A1025CFF5D2E3",
+        "05106136AE7F08A3C181D4648E5438350B1D2B4F"
+      ]
+    }
+  ],
   "audioCapture": [
     {
       "channel": "stable",

extensions/common/permissions/extensions_api_permissions.cc

@@ -14,6 +14,10 @@ namespace extensions {
 
 namespace {
 
+const char kOldAlwaysOnTopWindowsPermission[] = "alwaysOnTopWindows";
+const char kOldFullscreenPermission[] = "fullscreen";
+const char kOldOverrideEscFullscreenPermission[] = "overrideEscFullscreen";
+
 template <typename T>
 APIPermission* CreateAPIPermission(const APIPermissionInfo* permission) {
   return new T(permission);
@@ -24,12 +28,17 @@ APIPermission* CreateAPIPermission(const APIPermissionInfo* permission) {
 std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
     const {
   APIPermissionInfo::InitInfo permissions_to_register[] = {
+      {APIPermission::kAlphaEnabled, "app.window.alpha"},
+      {APIPermission::kAlwaysOnTopWindows, "app.window.alwaysOnTop"},
       {APIPermission::kAudioCapture, "audioCapture",
        APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_AUDIO_CAPTURE,
        PermissionMessage::kAudioCapture},
       {APIPermission::kDns, "dns"},
+      {APIPermission::kFullscreen, "app.window.fullscreen"},
       {APIPermission::kHid, "hid", APIPermissionInfo::kFlagNone,
        IDS_EXTENSION_PROMPT_WARNING_HID, PermissionMessage::kHid},
+      {APIPermission::kOverrideEscFullscreen,
+       "app.window.fullscreen.overrideEsc"},
       {APIPermission::kPower, "power"},
       {APIPermission::kSerial, "serial", APIPermissionInfo::kFlagNone,
        IDS_EXTENSION_PROMPT_WARNING_SERIAL, PermissionMessage::kSerial},
@@ -56,6 +65,7 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
       {APIPermission::kVideoCapture, "videoCapture",
        APIPermissionInfo::kFlagNone, IDS_EXTENSION_PROMPT_WARNING_VIDEO_CAPTURE,
        PermissionMessage::kVideoCapture},
+      {APIPermission::kWindowShape, "app.window.shape"},
   };
 
   std::vector<APIPermissionInfo*> permissions;
@@ -66,7 +76,15 @@ std::vector<APIPermissionInfo*> ExtensionsAPIPermissions::GetAllPermissions()
 
 std::vector<PermissionsProvider::AliasInfo>
 ExtensionsAPIPermissions::GetAllAliases() const {
-  return std::vector<PermissionsProvider::AliasInfo>();
+  std::vector<PermissionsProvider::AliasInfo> aliases;
+  aliases.push_back(PermissionsProvider::AliasInfo(
+      "app.window.alwaysOnTop", kOldAlwaysOnTopWindowsPermission));
+  aliases.push_back(PermissionsProvider::AliasInfo("app.window.fullscreen",
+                                                   kOldFullscreenPermission));
+  aliases.push_back(
+      PermissionsProvider::AliasInfo("app.window.fullscreen.overrideEsc",
+                                     kOldOverrideEscFullscreenPermission));
+  return aliases;
 }
 
 }  // namespace extensions