- Add support for references in different paths in apis.

- Move ImageDetails from chrome to extensions.

BUG=352290

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

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

7 files changed, 22 insertions, 22 deletions

diff --git a/chrome/common/extensions/api/BUILD.gn b/chrome/common/extensions/api/BUILD.gn
index 469227d..c74335f 100644
--- a/chrome/common/extensions/api/BUILD.gn
+++ b/chrome/common/extensions/api/BUILD.gn
@@ -9,6 +9,8 @@ import("schemas.gni")
 generated_extensions_api("api") {
   schemas = true
   bundle = true
+
+  deps = schema_dependencies
 }
 
 # GYP version: chrome/browser/extensions/api/api.gyp:chrome_api_registration
@@ -32,4 +34,5 @@ generated_extensions_api("api_registration") {
   if (is_chromeos) {
     # deps += [ "<(DEPTH)/chrome/chrome.gyp:drive_proto" ]  TODO(GYP)
   }
+  deps += schema_dependencies
 }
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 19b28fa..da226f7 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -18,6 +18,9 @@
         '../../../../build/json_schema_compile.gypi',
         'schemas.gypi',
       ],
+      'dependencies': [
+        '<@(schema_dependencies)',
+      ],
     },
   ],
 }
diff --git a/chrome/common/extensions/api/schemas.gni b/chrome/common/extensions/api/schemas.gni
index a8a8b41..9a43246 100644
--- a/chrome/common/extensions/api/schemas.gni
+++ b/chrome/common/extensions/api/schemas.gni
@@ -29,3 +29,6 @@ if (!is_android) {
 }
 
 root_namespace = "extensions::api::%(namespace)s"
+schema_include_rules =
+    "extensions/common/api:extensions::core_api::%(namespace)s"
+schema_dependencies = [ "//extensions/common/api" ]
diff --git a/chrome/common/extensions/api/schemas.gypi b/chrome/common/extensions/api/schemas.gypi
index b7b9d17..4e7b234 100644
--- a/chrome/common/extensions/api/schemas.gypi
+++ b/chrome/common/extensions/api/schemas.gypi
@@ -116,6 +116,9 @@
       'web_view_internal.json',
       'windows.json',
     ],
+    'main_schema_include_rules': [
+      'extensions/common/api:extensions::core_api::%(namespace)s',
+    ],
     'main_non_compiled_schema_files': [
       'browsing_data.json',
       'chromeos_info_private.json',
@@ -157,12 +160,20 @@
         'non_compiled_schema_files': [
           '<@(main_non_compiled_schema_files)',
         ],
+        'schema_dependencies': [
+          '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
+        ],
         'schema_files': [
           '<@(main_schema_files)',
         ],
+        'schema_include_rules': [
+          '<@(main_schema_include_rules)',
+        ],
       }, {  # enable_extensions==0
         'non_compiled_schema_files': [
         ],
+        'schema_dependencies': [
+        ],
         'schema_files': [
           # These should be eliminated. See crbug.com/305852.
           '<@(android_schema_files)',
diff --git a/chrome/common/extensions/api/tabs.json b/chrome/common/extensions/api/tabs.json
index 931a293..f3c9348 100644
--- a/chrome/common/extensions/api/tabs.json
+++ b/chrome/common/extensions/api/tabs.json
@@ -654,7 +654,7 @@
             "description": "The target window. Defaults to the <a href='windows#current-window'>current window</a>."
           },
           {
-            "$ref": "types.ImageDetails",
+            "$ref": "extensionTypes.ImageDetails",
             "name": "options",
             "optional": true
           },
diff --git a/chrome/common/extensions/api/types.json b/chrome/common/extensions/api/types.json
index 80f8c6a..1a7c306 100644
--- a/chrome/common/extensions/api/types.json
+++ b/chrome/common/extensions/api/types.json
@@ -150,26 +150,6 @@
             ]
           }
         ]
-      },
-      {
-        "id": "ImageDetails",
-        "type": "object",
-        "description": "Details about the format and quality of an image.",
-        "properties": {
-          "format": {
-            "type": "string",
-            "optional": true,
-            "enum": ["jpeg", "png"],
-            "description": "The format of the resulting image.  Default is <code>\"jpeg\"</code>."
-          },
-          "quality": {
-            "type": "integer",
-            "optional": true,
-            "minimum": 0,
-            "maximum": 100,
-            "description": "When format is <code>\"jpeg\"</code>, controls the quality of the resulting image.  This value is ignored for PNG images.  As quality is decreased, the resulting image will have more visual artifacts, and the number of bytes needed to store it will decrease."
-          }
-        }
       }
     ]
   }
diff --git a/chrome/common/extensions/api/web_view_internal.json b/chrome/common/extensions/api/web_view_internal.json
index c09c126..a05e860 100644
--- a/chrome/common/extensions/api/web_view_internal.json
+++ b/chrome/common/extensions/api/web_view_internal.json
@@ -412,7 +412,7 @@
             "description": "The instance ID of the guest <webview> process."
           },
           {
-            "$ref": "types.ImageDetails",
+            "$ref": "extensionTypes.ImageDetails",
             "name": "options",
             "optional": true
           },