Bookmarks: Stop using chrome_extensions.js for type checking.

Instead use the auto-generated bookmarks.js externs file.

Bug: 1081815
Change-Id: I626971c485237bd9668665b4774d6adb6a182903
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2229016Reviewed-by: John Lee <johntlee@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#776805}

chrome/browser/resources/bookmarks/BUILD.gn

@@ -101,7 +101,8 @@ js_library("actions") {
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:store.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("api_listener") {
@@ -115,7 +116,8 @@ js_library("api_listener") {
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:store.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("app") {
@@ -131,7 +133,10 @@ js_library("app") {
     "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [
+    "$externs_path/bookmarks.js",
+    "$externs_path/metrics_private.js",
+  ]
 }
 
 js_library("browser_proxy") {
@@ -160,7 +165,10 @@ js_library("command_manager") {
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js/cr/ui:keyboard_shortcut_list.m",
   ]
-  externs_list = [ "$externs_path/bookmark_manager_private.js" ]
+  externs_list = chrome_extension_public_externs + [
+                   "$externs_path/bookmark_manager_private.js",
+                   "$externs_path/bookmarks.js",
+                 ]
 }
 
 js_library("constants") {
@@ -203,7 +211,7 @@ js_library("edit_dialog") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("folder_node") {
@@ -216,7 +224,6 @@ js_library("folder_node") {
     ":util",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
 js_library("item") {
@@ -233,7 +240,6 @@ js_library("item") {
     "//ui/webui/resources/js:icon.m",
     "//ui/webui/resources/js/cr/ui:focus_without_ink.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
 js_library("list") {
@@ -281,7 +287,6 @@ js_library("store") {
     "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js/cr/ui:store.m",
   ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
 }
 
 js_library("store_client") {
@@ -306,18 +311,15 @@ js_library("toolbar") {
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
-  externs_list = [
-    "$externs_path/bookmark_manager_private.js",
-    "$externs_path/chrome_extensions.js",
-  ]
 }
 
 js_library("types") {
   deps = [ ":constants" ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }
 
 js_library("util") {
   deps = [ ":types" ]
-  externs_list = [ "$externs_path/chrome_extensions.js" ]
+
+  externs_list = [ "$externs_path/bookmarks.js" ]
 }

chrome/browser/resources/bookmarks/actions.js

@@ -16,7 +16,7 @@ import {getDescendants, getDisplayedList, normalizeNode} from './util.js';
 
 /**
  * @param {string} id
- * @param {BookmarkTreeNode} treeNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} treeNode
  */
 export function createBookmark(id, treeNode) {
   return {

chrome/browser/resources/bookmarks/api_listener.js

@@ -89,7 +89,7 @@ function onBookmarkChanged(id, changeInfo) {
 
 /**
  * @param {string} id
- * @param {BookmarkTreeNode} treeNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} treeNode
  */
 function onBookmarkCreated(id, treeNode) {
   batchUIUpdates();

chrome/browser/resources/bookmarks/types.js

@@ -97,7 +97,7 @@ export class BookmarkElement extends HTMLElement {
 
 export class DragData {
   constructor() {
-    /** @type {Array<BookmarkTreeNode>} */
+    /** @type {Array<chrome.bookmarks.BookmarkTreeNode>} */
     this.elements = null;
 
     /** @type {boolean} */

chrome/browser/resources/bookmarks/util.js

@@ -26,7 +26,7 @@ export function getDisplayedList(state) {
 }
 
 /**
- * @param {BookmarkTreeNode} treeNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} treeNode
  * @return {!BookmarkNode}
  */
 export function normalizeNode(treeNode) {
@@ -46,7 +46,7 @@ export function normalizeNode(treeNode) {
 }
 
 /**
- * @param {BookmarkTreeNode} rootNode
+ * @param {chrome.bookmarks.BookmarkTreeNode} rootNode
  * @return {NodeMap}
  */
 export function normalizeNodes(rootNode) {

third_party/closure_compiler/externs/bookmark_manager_private.js

@@ -10,7 +10,7 @@
 // See https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
 
 // IMPORTANT NOTE: Work-around for crbug.com/543822
-// s/chrome.bookmarkManagerPrivate.bookmarks.BookmarkTreeNode/BookmarkTreeNode/
+// s/chrome.bookmarkManagerPrivate.bookmarks.BookmarkTreeNode/chrome.bookmarks.BookmarkTreeNode/
 
 /** @fileoverview Externs generated from namespace: bookmarkManagerPrivate */
 
@@ -79,10 +79,10 @@ chrome.bookmarkManagerPrivate.sortChildren = function(parentId) {};
  * @param {!Array<string>} idList An array of string-valued ids.
  * @param {number} dragNodeIndex The index of the dragged node in |idList|
  * @param {boolean} isFromTouch True if the drag was initiated from touch.
- * @param {number} offsetX The offset X of the event
- * @param {number} offsetY The offset Y of the event
+ * @param {number} x The clientX of the dragStart event
+ * @param {number} y The clientY of the dragStart event
  */
-chrome.bookmarkManagerPrivate.startDrag = function(idList, dragNodeIndex, isFromTouch, offsetX, offsetY) {};
+chrome.bookmarkManagerPrivate.startDrag = function(idList, dragNodeIndex, isFromTouch, x, y) {};
 
 /**
  * Performs the drop action of the drag and drop session.
@@ -100,7 +100,7 @@ chrome.bookmarkManagerPrivate.drop = function(parentId, index, callback) {};
  * @param {string} id ID of the root of the tree to pull.  If empty, the entire
  *     tree will be returned.
  * @param {boolean} foldersOnly Pass true to only return folders.
- * @param {function(!Array<!BookmarkTreeNode>): void}
+ * @param {function(!Array<!chrome.bookmarks.BookmarkTreeNode>): void}
  *     callback
  */
 chrome.bookmarkManagerPrivate.getSubtree = function(id, foldersOnly, callback) {};