[Extensions API] Remove inline enums

chrome/common/extensions/api/content_settings.json

Index: chrome/common/extensions/api/content_settings.json
diff --git a/chrome/common/extensions/api/content_settings.json b/chrome/common/extensions/api/content_settings.json
index b44bff59f619b6ceba4f0de42d8700ab08088077..b4bde704ccd6cc95771850b1a1188bfc61f5c1b2 100644
--- a/chrome/common/extensions/api/content_settings.json
+++ b/chrome/common/extensions/api/content_settings.json
@@ -27,6 +27,12 @@
         "description": "The only content type using resource identifiers is $(ref:contentSettings.plugins). For more information, see <a href=\"contentSettings#resource-identifiers\">Resource Identifiers</a>."
       },
       {
+        "id": "Scope",
+        "type": "string",
+        "enum": ["regular", "incognito_session_only"],
+        "description": "The scope of the ContentSetting. One of<br><var>regular</var>: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),<br><var>incognito_session_only</var>: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings)."
+      },
+      {
         "id": "ContentSetting",
         "js_module": "ContentSetting",
         "type": "object",
@@ -41,10 +47,9 @@
                 "type": "object",
                 "properties": {
                   "scope": {
-                    "type": "string",
-                    "enum": ["regular", "incognito_session_only"],
+                    "$ref": "Scope",
                     "optional": true,
-                    "description": "Where to clear the setting (default: regular). One of<br><var>regular</var>: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),<br><var>incognito_session_only</var>: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings)."
+                    "description": "Where to clear the setting (default: regular)."
                   }
                 }
               },
@@ -132,10 +137,9 @@
                     "description": "The setting applied by this rule. See the description of the individual ContentSetting objects for the possible values."
                   },
                   "scope": {
-                    "type": "string",
-                    "enum": ["regular", "incognito_session_only"],
+                    "$ref": "Scope",
                     "optional": true,
-                    "description": "Where to set the setting (default: regular). One of<br><var>regular</var>: setting for regular profile (which is inherited by the incognito profile if not overridden elsewhere),<br><var>incognito_session_only</var>: setting for incognito profile that can only be set during an incognito session and is deleted when the incognito session ends (overrides regular settings)."
+                    "description": "Where to set the setting (default: regular)."
                   }
                 }
               },
@@ -170,6 +174,61 @@
             ]
           }
         ]
+      },
+      {
+        "id": "CookiesContentSetting",
+        "type": "string",
+        "enum": ["allow", "block", "session_only"]
+      },
+      {
+        "id": "ImagesContentSetting",
+        "type": "string",
+        "enum": ["allow", "block"]
+      },
+      {
+        "id": "JavascriptContentSetting",
+        "type": "string",
+        "enum": ["allow", "block"]
+      },
+      {
+        "id": "LocationContentSetting",
+        "type": "string",
+        "enum": ["allow", "block", "ask"]
+      },
+      {
+        "id": "PluginsContentSetting",
+        "type": "string",
+        "enum": ["allow", "block"]
+      },
+      {
+        "id": "PopupsContentSetting",
+        "type": "string",
+        "enum": ["allow", "block"]
+      },
+      {
+        "id": "NotificationsContentSetting",
+        "type": "string",
+        "enum": ["allow", "block", "ask"]
+      },
+      {
+        "id": "FullscreenContentSetting",
+        "type": "string",
+        "enum": ["allow", "ask"]
+      },
+      {
+        "id": "MouselockContentSetting",
+        "type": "string",
+        "enum": ["allow", "block", "ask"]
+      },
+      {
+        "id": "PpapiBrokerContentSetting",
+        "type": "string",
+        "enum": ["allow", "block", "ask"]
+      },
+      {
+        "id": "MultipleAutomaticDownloadsContentSetting",
+        "type": "string",
+        "enum": ["allow", "block", "ask"]
       }
     ],
     "properties": {
@@ -178,7 +237,7 @@
         "description": "Whether to allow cookies and other local data to be set by websites. One of<br><var>allow</var>: Accept cookies,<br><var>block</var>: Block cookies,<br><var>session_only</var>: Accept cookies only for the current session. <br>Default is <var>allow</var>.<br>The primary URL is the URL representing the cookie origin. The secondary URL is the URL of the top-level frame.",
         "value": [
           "cookies",
-          {"type":"string", "enum": ["allow", "block", "session_only"]}
+          {"$ref":"CookiesContentSetting"}
         ]
       },
       "images": {
@@ -186,7 +245,7 @@
         "description": "Whether to show images. One of<br><var>allow</var>: Show images,<br><var>block</var>: Don't show images. <br>Default is <var>allow</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is the URL of the image.",
         "value": [
           "images",
-          {"type":"string", "enum": ["allow", "block"]}
+          {"$ref":"ImagesContentSetting"}
         ]
       },
       "javascript": {
@@ -194,7 +253,7 @@
         "description": "Whether to run JavaScript. One of<br><var>allow</var>: Run JavaScript,<br><var>block</var>: Don't run JavaScript. <br>Default is <var>allow</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
         "value": [
           "javascript",
-          {"type":"string", "enum": ["allow", "block"]}
+          {"$ref":"JavascriptContentSetting"}
         ]
       },
       "location": {
@@ -202,7 +261,7 @@
         "description": "Whether to allow Geolocation. One of <br><var>allow</var>: Allow sites to track your physical location,<br><var>block</var>: Don't allow sites to track your physical location,<br><var>ask</var>: Ask before allowing sites to track your physical location. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the document which requested location data. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).",
         "value": [
           "location",
-          {"type":"string", "enum": ["allow", "block", "ask"]}
+          {"$ref":"LocationContentSetting"}
         ]
       },
       "plugins": {
@@ -210,7 +269,7 @@
         "description": "Whether to run plugins. One of<br><var>allow</var>: Run plugins automatically,<br><var>block</var>: Don't run plugins automatically. <br>Default is <var>allow</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
         "value": [
           "plugins",
-          {"type":"string", "enum": ["allow", "block"]}
+          {"$ref":"PluginsContentSetting"}
         ]
       },
       "popups": {
@@ -218,7 +277,7 @@
         "description": "Whether to allow sites to show pop-ups. One of<br><var>allow</var>: Allow sites to show pop-ups,<br><var>block</var>: Don't allow sites to show pop-ups. <br>Default is <var>block</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
         "value": [
           "popups",
-          {"type":"string", "enum": ["allow", "block"]}
+          {"$ref":"PopupsContentSetting"}
         ]
       },
       "notifications": {
@@ -226,7 +285,7 @@
         "description": "Whether to allow sites to show desktop notifications. One of<br><var>allow</var>: Allow sites to show desktop notifications,<br><var>block</var>: Don't allow sites to show desktop notifications,<br><var>ask</var>: Ask when a site wants to show desktop notifications. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the document which wants to show the notification. The secondary URL is not used.",
         "value": [
           "notifications",
-          {"type":"string", "enum": ["allow", "block", "ask"]}
+          {"$ref":"NotificationsContentSetting"}
         ]
       },
       "fullscreen": {
@@ -234,7 +293,7 @@
         "description": "Whether to allow sites to toggle the fullscreen mode. One of<br><var>allow</var>: Allow sites to toggle the fullscreen mode,<br><var>ask</var>: Ask when a site wants to toggle the fullscreen mode. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the document which requested to toggle the fullscreen mode. The secondary URL is the URL of the top-level frame (which may or may not differ from the requesting URL).",
         "value": [
           "fullscreen",
-          {"type":"string", "enum": ["allow", "ask"]}
+          {"$ref":"FullscreenContentSetting"}
         ]
       },
       "mouselock": {
@@ -242,7 +301,7 @@
         "description": "Whether to allow sites to disable the mouse cursor. One of <br><var>allow</var>: Allow sites to disable the mouse cursor,<br><var>block</var>: Don't allow sites to disable the mouse cursor,<br><var>ask</var>: Ask when a site wants to disable the mouse cursor. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
         "value": [
           "mouselock",
-          {"type":"string", "enum": ["allow", "block", "ask"]}
+          {"$ref":"MouselockContentSetting"}
         ]
       },
       "unsandboxedPlugins": {
@@ -250,7 +309,7 @@
         "description": "Whether to allow sites to run plugins unsandboxed. One of <br><var>allow</var>: Allow sites to run plugins unsandboxed,<br><var>block</var>: Don't allow sites to run plugins unsandboxed,<br><var>ask</var>: Ask when a site wants to run a plugin unsandboxed. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
         "value": [
           "ppapi-broker",
-          {"type":"string", "enum": ["allow", "block", "ask"]}
+          {"$ref":"PpapiBrokerContentSetting"}
         ]
       },
       "automaticDownloads": {
@@ -258,7 +317,7 @@
         "description": "Whether to allow sites to download multiple files automatically. One of <br><var>allow</var>: Allow sites to download multiple files automatically,<br><var>block</var>: Don't allow sites to download multiple files automatically,<br><var>ask</var>: Ask when a site wants to download files automatically after the first file. <br>Default is <var>ask</var>.<br>The primary URL is the URL of the top-level frame. The secondary URL is not used.",
         "value": [
           "multiple-automatic-downloads",
-          {"type":"string", "enum": ["allow", "block", "ask"]}
+          {"$ref":"MultipleAutomaticDownloadsContentSetting"}
         ]
       }
     }