Move bookmarks_ui manifest key from chrome_settings_overrides to chrome_ui_overrides

chrome/common/extensions/api/manifest_types.json

Index: chrome/common/extensions/api/manifest_types.json
diff --git a/chrome/common/extensions/api/manifest_types.json b/chrome/common/extensions/api/manifest_types.json
index f297c2846dcdcc530880d7c2e00a955181403f64..e10dfa8b3d1b0ff3d9efd5fec41a71a8a5d3acbb 100644
--- a/chrome/common/extensions/api/manifest_types.json
+++ b/chrome/common/extensions/api/manifest_types.json
@@ -43,10 +43,12 @@
         "type": "object",
         "description": "Chrome settings which can be overriden by an extension.",
         "properties": {
+          // TODO(wittman): Remove for M36.
           "bookmarks_ui": {
             "type": "object",
             "description": "Settings to permit bookmarks user interface customization by extensions.",
             "optional": true,
+            "nodoc": true,
             "properties": {
               "remove_button": {
                 "type": "boolean",
@@ -55,10 +57,9 @@
               },
               "remove_bookmark_shortcut": {
                 "type": "boolean",
-                "description": "If <code>true</code>, the built-in \"Bookmark this page...\" shortcut key is removed and the extension is permitted to override the shortcut by binding it in the commands section of the manifest.",
+                "description": "If <code>true</code>, the built-in \"Bookmark this page...\" shortcut key is removed and the extension is permitted to override the shortcut by binding it in the commands section of the manifest. The corresponding menu item is also removed or overridden as well.",
                 "optional": true
               },
-              // TODO(wittman): Remove for M36.
               "hide_bookmark_button": {
                 "type": "boolean",
                 "description": "Deprecated. Use remove_button instead.",
@@ -152,6 +153,30 @@
         }
       },
       {
+        "id": "ChromeUIOverrides",
+        "type": "object",
+        "description": "Chrome user interface features which can be overriden by an extension.",
+        "properties": {
+          "bookmarks_ui": {
+            "type": "object",
+            "description": "Settings to permit bookmarks user interface customization by extensions.",
+            "optional": true,
+            "properties": {
+              "remove_button": {
+                "type": "boolean",
+                "description": "If <code>true</code>, the built-in bookmark button will be removed from the user interface.",
+                "optional": true
+              },
+              "remove_bookmark_shortcut": {
+                "type": "boolean",
+                "description": "If <code>true</code>, the built-in \"Bookmark this page...\" shortcut key is removed and the extension is permitted to override the shortcut by binding it in the commands section of the manifest.",
+                "optional": true
+              }
+            }
+          }
+        }
+      },
+      {
         "id": "SocketHostPatterns",
         "description": "<p>A single string or a list of strings representing host:port patterns.</p>",
         "choices": [