Typecheck chrome://bookmarks using Closure Compiler

chrome/browser/resources/bookmark_manager/js/main.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 (function() {
 /** @const */ var BookmarkList = bmm.BookmarkList;
 /** @const */ var BookmarkTree = bmm.BookmarkTree;
 /** @const */ var Command = cr.ui.Command;
-/** @const */ var CommandBinding = cr.ui.CommandBinding;
 /** @const */ var LinkKind = cr.LinkKind;
 /** @const */ var ListItem = cr.ui.ListItem;
 /** @const */ var Menu = cr.ui.Menu;
 /** @const */ var MenuButton = cr.ui.MenuButton;
 /** @const */ var Splitter = cr.ui.Splitter;
 /** @const */ var TreeItem = cr.ui.TreeItem;
 
 /**
  * An array containing the BookmarkTreeNodes that were deleted in the last
  * deletion action. This is used for implementing undo.
- * @type {Array.<BookmarkTreeNode>}
+ * @type {Array.<Array.<BookmarkTreeNode>>}
  */
 var lastDeletedNodes;
 
 /**
  *
  * Holds the last DOMTimeStamp when mouse pointer hovers on folder in tree
  * view. Zero means pointer doesn't hover on folder.
  * @type {number}
  */
 var lastHoverOnFolderTimeStamp = 0;
 
 /**
  * Holds a function that will undo that last action, if global undo is enabled.
  * @type {Function}
  */
 var performGlobalUndo;
 
 /**
  * Holds a link controller singleton. Use getLinkController() rarther than
  * accessing this variabie.
- * @type {LinkController}
+ * @type {cr.LinkController}
  */
 var linkController;
 
 /**
  * New Windows are not allowed in Windows 8 metro mode.
  */
 var canOpenNewWindows = true;
 
 /**
  * Incognito mode availability can take the following values: ,
@@ skipping 83 matching lines @@
 
   searchTreeItem.label = loadTimeData.getString('search');
   searchTreeItem.icon = isRTL() ? 'images/bookmark_manager_search_rtl.png' :
                                   'images/bookmark_manager_search.png';
 }
 
 /**
  * Updates the location hash to reflect the current state of the application.
  */
 function updateHash() {
-  window.location.hash = tree.selectedItem.bookmarkId;
+  window.location.hash = $('tree').selectedItem.bookmarkId;
   updateAllCommands();
 }
 
 /**
  * Navigates to a bookmark ID.
  * @param {string} id The ID to navigate to.
  * @param {function()=} opt_callback Function called when list view loaded or
  *     displayed specified folder.
  */
 function navigateTo(id, opt_callback) {
   window.location.hash = id;
   updateAllCommands();
 
   var metricsId = folderMetricsNameMap[id.replace(/^q=.*/, 'q=')] ||
                   folderMetricsNameMap['subfolder'];
   chrome.metricsPrivate.recordUserAction(
       'BookmarkManager_NavigateTo_' + metricsId);
 
   if (opt_callback) {
-    if (list.parentId == id)
+    if ($('list').parentId == id)

[Dan Beam, 2014/09/23 02:46:56]

cast to !Element here as you're already doing maybeNull.property

[Vitaly Pavlenko, 2014/09/23 22:20:55]

Done.

       opt_callback();
     else
-      addOneShotEventListener(list, 'load', opt_callback);
+      addOneShotEventListener(/** @type {!Element} */($('list')), 'load',
+                              opt_callback);

[Dan Beam, 2014/09/23 02:46:56]

if () needs curlies

[Vitaly Pavlenko, 2014/09/23 22:20:55]

Done.

   }
 }
 
 /**
  * Updates the parent ID of the bookmark list and selects the correct tree item.
  * @param {string} id The id.
  */
 function updateParentId(id) {
   // Setting list.parentId fires 'load' event.
-  list.parentId = id;
+  $('list').parentId = id;
 
   // When tree.selectedItem changed, tree view calls navigatTo() then it
   // calls updateHash() when list view displayed specified folder.
-  tree.selectedItem = bmm.treeLookup[id] || tree.selectedItem;
+  $('tree').selectedItem = bmm.treeLookup[id] || $('tree').selectedItem;
 }
 
 // Process the location hash. This is called by onhashchange and when the page
 // is first loaded.
 function processHash() {
   var id = window.location.hash.slice(1);
   if (!id) {
     // If we do not have a hash, select first item in the tree.
-    id = tree.items[0].bookmarkId;
+    id = $('tree').items[0].bookmarkId;
   }
 
   var valid = false;
   if (/^e=/.test(id)) {
     id = id.slice(2);
 
     // If hash contains e=, edit the item specified.
     chrome.bookmarks.get(id, function(bookmarkNodes) {
       // Verify the node to edit is a valid node.
       if (!bookmarkNodes || bookmarkNodes.length != 1)
         return;
       var bookmarkNode = bookmarkNodes[0];
 
       // After the list reloads, edit the desired bookmark.
-      var editBookmark = function(e) {
-        var index = list.dataModel.findIndexById(bookmarkNode.id);
+      var editBookmark = function() {
+        var index = $('list').dataModel.findIndexById(bookmarkNode.id);
         if (index != -1) {
-          var sm = list.selectionModel;
+          var sm = $('list').selectionModel;
           sm.anchorIndex = sm.leadIndex = sm.selectedIndex = index;
           scrollIntoViewAndMakeEditable(index);
         }
       };
 
       navigateTo(bookmarkNode.parentId, editBookmark);
     });
 
     // We handle the two cases of navigating to the bookmark to be edited
     // above. Don't run the standard navigation code below.
@@ skipping 46 matching lines @@
     var id = searchTreeItem.bookmarkId = 'q=' + searchText;
     bmm.treeLookup[searchTreeItem.bookmarkId] = searchTreeItem;
   }
 
   var input = $('term');
   // Do not update the input if the user is actively using the text input.
   if (document.activeElement != input)
     input.value = searchText;
 
   if (searchText) {
-    tree.add(searchTreeItem);
-    tree.selectedItem = searchTreeItem;
+    $('tree').add(searchTreeItem);
+    $('tree').selectedItem = searchTreeItem;
   } else {
     // Go "home".
-    tree.selectedItem = tree.items[0];
-    id = tree.selectedItem.bookmarkId;
+    $('tree').selectedItem = $('tree').items[0];
+    id = $('tree').selectedItem.bookmarkId;
   }
 
   navigateTo(id);
 }
 
 /**
  * This returns the user visible path to the folder where the bookmark is
  * located.
  * @param {number} parentId The ID of the parent folder.
  * @return {string} The path to the the bookmark,
  */
 function getFolder(parentId) {
-  var parentNode = tree.getBookmarkNodeById(parentId);
+  var parentNode = $('tree').getBookmarkNodeById(parentId);
   if (parentNode) {
     var s = parentNode.title;
     if (parentNode.parentId != bmm.ROOT_ID) {
       return getFolder(parentNode.parentId) + '/' + s;
     }
     return s;
   }
 }
 
 function handleLoadForTree(e) {
@@ skipping 19 matching lines @@
         if (!bmm.isFolder(child))
           urls.push(child.url);
       });
     } else {
       urls.push(node.url);
     }
   }
 
   // Get a future promise for the nodes.
   var promises = nodes.map(function(node) {
-    if (bmm.isFolder(node))
+    if (bmm.isFolder(assert(node)))
       return bmm.loadSubtree(node.id);
     // Not a folder so we already have all the data we need.
     return Promise.resolve(node);
   });
 
   return Promise.all(promises).then(function(nodes) {
     nodes.forEach(addNodes);
     return urls;
   });
 }
 
 /**
  * Returns the nodes (non recursive) to use for the open commands.
- * @param {HTMLElement} target .
- * @return {Array.<BookmarkTreeNode>} .
+ * @param {HTMLElement} target
+ * @return {!Array.<BookmarkTreeNode>}
  */
 function getNodesForOpen(target) {
-  if (target == tree) {
-    if (tree.selectedItem != searchTreeItem)
-      return tree.selectedFolders;
+  if (target == $('tree')) {
+    if ($('tree').selectedItem != searchTreeItem)
+      return $('tree').selectedFolders;
     // Fall through to use all nodes in the list.
   } else {
-    var items = list.selectedItems;
+    var items = $('list').selectedItems;
     if (items.length)
       return items;
   }
 
   // The list starts off with a null dataModel. We can get here during startup.
-  if (!list.dataModel)
+  if (!$('list').dataModel)
     return [];
 
   // Return an array based on the dataModel.
-  return list.dataModel.slice();
+  return $('list').dataModel.slice();
 }
 
 /**
  * Returns a promise that will contain all URLs of all the selected bookmarks
  * and the nested bookmarks for use with the open commands.
  * @param {HTMLElement} target The target list or tree.
  * @return {Promise.<Array.<string>>} .
  */
 function getUrlsForOpenCommands(target) {
   return getAllUrls(getNodesForOpen(target));
@@ skipping 12 matching lines @@
  * @param {string} pluralId The string id of menu label if the singular form is
        not used.
  * @param {boolean} commandDisabled Whether the menu item should be disabled
        no matter what bookmarks are selected.
  */
 function updateOpenCommand(e, command, singularId, pluralId, commandDisabled) {
   if (singularId) {
     // The command label reflects the selection which might not reflect
     // how many bookmarks will be opened. For example if you right click an
     // empty area in a folder with 1 bookmark the text should still say "all".
+    assert(!e.target || e.target instanceof BookmarkList ||
+        e.target instanceof BookmarkTree);
     var selectedNodes = getSelectedBookmarkNodes(e.target).filter(notNewNode);
     var singular = selectedNodes.length == 1 && !bmm.isFolder(selectedNodes[0]);
     command.label = loadTimeData.getString(singular ? singularId : pluralId);
   }
 
   if (commandDisabled) {
     command.disabled = true;
     e.canExecute = false;
     return;
   }
 
-  getUrlsForOpenCommands(e.target).then(function(urls) {
+  getUrlsForOpenCommands(assertInstanceof(e.target, HTMLElement)).then(
+      function(urls) {
     var disabled = !urls.length;
     command.disabled = disabled;
     e.canExecute = !disabled;
   });
 }
 
 /**
  * Calls the backend to figure out if we can paste the clipboard into the active
  * folder.
  * @param {Function=} opt_f Function to call after the state has been updated.
  */
 function updatePasteCommand(opt_f) {
   function update(canPaste) {
     var organizeMenuCommand = $('paste-from-organize-menu-command');
     var contextMenuCommand = $('paste-from-context-menu-command');
     organizeMenuCommand.disabled = !canPaste;
     contextMenuCommand.disabled = !canPaste;
     if (opt_f)
       opt_f();
   }
   // We cannot paste into search view.
-  if (list.isSearch())
+  if ($('list').isSearch())
     update(false);
   else
-    chrome.bookmarkManagerPrivate.canPaste(list.parentId, update);
+    chrome.bookmarkManagerPrivate.canPaste($('list').parentId, update);
 }
 
 function handleCanExecuteForDocument(e) {
   var command = e.command;
   switch (command.id) {
     case 'import-menu-command':
       e.canExecute = canEdit;
       break;
     case 'export-menu-command':
       // We can always execute the export-menu command.
       e.canExecute = true;
       break;
     case 'sort-command':
-      e.canExecute = !list.isSearch() &&
-          list.dataModel && list.dataModel.length > 1 &&
-          !isUnmodifiable(tree.getBookmarkNodeById(list.parentId));
+      e.canExecute = !$('list').isSearch() &&
+          $('list').dataModel && $('list').dataModel.length > 1 &&
+          !isUnmodifiable($('tree').getBookmarkNodeById($('list').parentId));
       break;
     case 'undo-command':
       // If the search box is active, pass the undo command through
       // (fixes http://crbug.com/278112). Otherwise, because
       // the global undo command has no visible UI, always enable it, and
       // just make it a no-op if undo is not possible.
       e.canExecute = e.currentTarget.activeElement !== $('term');
       break;
     default:
       canExecuteForList(e);
       break;
   }
 }
 
 /**
  * Helper function for handling canExecute for the list and the tree.
- * @param {!Event} e Can execute event object.
+ * @param {!cr.ui.CanExecuteEvent} e Can execute event object.
  * @param {boolean} isSearch Whether the user is trying to do a command on
  *     search.
  */
 function canExecuteShared(e, isSearch) {
   var command = e.command;
   var commandId = command.id;
   switch (commandId) {
     case 'paste-from-organize-menu-command':
     case 'paste-from-context-menu-command':
       updatePasteCommand();
       break;
 
     case 'add-new-bookmark-command':
     case 'new-folder-command':
       var parentId = computeParentFolderForNewItem();
-      var unmodifiable = isUnmodifiable(tree.getBookmarkNodeById(parentId));
+      var unmodifiable = isUnmodifiable(
+          $('tree').getBookmarkNodeById(parentId));
       e.canExecute = !isSearch && canEdit && !unmodifiable;
       break;
 
     case 'open-in-new-tab-command':
       updateOpenCommand(e, command, 'open_in_new_tab', 'open_all', false);
       break;
     case 'open-in-background-tab-command':
       updateOpenCommand(e, command, '', '', false);
       break;
     case 'open-in-new-window-command':
@@ skipping 10 matching lines @@
       break;
 
     case 'undo-delete-command':
       e.canExecute = !!lastDeletedNodes;
       break;
   }
 }
 
 /**
  * Helper function for handling canExecute for the list and document.
- * @param {!Event} e Can execute event object.
+ * @param {!cr.ui.CanExecuteEvent} e Can execute event object.
  */
 function canExecuteForList(e) {
   var command = e.command;
   var commandId = command.id;
 
   function hasSelected() {
-    return !!list.selectedItem;
+    return !!$('list').selectedItem;
   }
 
   function hasSingleSelected() {
-    return list.selectedItems.length == 1;
+    return $('list').selectedItems.length == 1;
   }
 
   function canCopyItem(item) {
     return item.id != 'new';
   }
 
   function canCopyItems() {
-    var selectedItems = list.selectedItems;
+    var selectedItems = $('list').selectedItems;
     return selectedItems && selectedItems.some(canCopyItem);
   }
 
   function isSearch() {
-    return list.isSearch();
+    return $('list').isSearch();
   }
 
   switch (commandId) {
     case 'rename-folder-command':
       // Show rename if a single folder is selected.
-      var items = list.selectedItems;
+      var items = $('list').selectedItems;
       if (items.length != 1) {
         e.canExecute = false;
         command.hidden = true;
       } else {
         var isFolder = bmm.isFolder(items[0]);
         e.canExecute = isFolder && canEdit && !hasUnmodifiable(items);
         command.hidden = !isFolder;
       }
       break;
 
     case 'edit-command':
       // Show the edit command if not a folder.
-      var items = list.selectedItems;
+      var items = $('list').selectedItems;
       if (items.length != 1) {
         e.canExecute = false;
         command.hidden = false;
       } else {
         var isFolder = bmm.isFolder(items[0]);
         e.canExecute = !isFolder && canEdit && !hasUnmodifiable(items);
         command.hidden = isFolder;
       }
       break;
 
     case 'show-in-folder-command':
       e.canExecute = isSearch() && hasSingleSelected();
       break;
 
     case 'delete-command':
     case 'cut-command':
       e.canExecute = canCopyItems() && canEdit &&
-          !hasUnmodifiable(list.selectedItems);
+          !hasUnmodifiable($('list').selectedItems);
       break;
 
     case 'copy-command':
       e.canExecute = canCopyItems();
       break;
 
     case 'open-in-same-window-command':
       e.canExecute = hasSelected();
       break;
 
     default:
       canExecuteShared(e, isSearch());
   }
 }
 
 // Update canExecute for the commands when the list is the active element.
 function handleCanExecuteForList(e) {
-  if (e.target != list) return;
+  if (e.target != $('list')) return;
   canExecuteForList(e);
 }
 
 // Update canExecute for the commands when the tree is the active element.
 function handleCanExecuteForTree(e) {
-  if (e.target != tree) return;
+  if (e.target != $('tree')) return;
 
   var command = e.command;
   var commandId = command.id;
 
   function hasSelected() {
     return !!e.target.selectedItem;
   }
 
   function isSearch() {
     var item = e.target.selectedItem;
     return item == searchTreeItem;
   }
 
   function isTopLevelItem() {
-    return e.target.selectedItem.parentNode == tree;
+    return e.target.selectedItem.parentNode == $('tree');
   }
 
   switch (commandId) {
     case 'rename-folder-command':
       command.hidden = false;
       e.canExecute = hasSelected() && !isTopLevelItem() && canEdit &&
-          !hasUnmodifiable(tree.selectedFolders);
+          !hasUnmodifiable($('tree').selectedFolders);
       break;
 
     case 'edit-command':
       command.hidden = true;
       e.canExecute = false;
       break;
 
     case 'delete-command':
     case 'cut-command':
       e.canExecute = hasSelected() && !isTopLevelItem() && canEdit &&
-          !hasUnmodifiable(tree.selectedFolders);
+          !hasUnmodifiable($('tree').selectedFolders);
       break;
 
     case 'copy-command':
       e.canExecute = hasSelected() && !isTopLevelItem();
       break;
 
     default:
       canExecuteShared(e, isSearch());
   }
 }
@@ skipping 17 matching lines @@
     if (result != canEdit) {
       canEdit = result;
       editingCommands.forEach(function(baseId) {
         $(baseId + '-command').canExecuteChange();
       });
     }
   });
 }
 
 function handleChangeForTree(e) {
-  navigateTo(tree.selectedItem.bookmarkId);
+  navigateTo($('tree').selectedItem.bookmarkId);
 }
 
 function handleOrganizeButtonClick(e) {
   updateEditingCommands();
   $('add-new-bookmark-command').canExecuteChange();
   $('new-folder-command').canExecuteChange();
   $('sort-command').canExecuteChange();
 }
 
 function handleRename(e) {
   var item = e.target;
   var bookmarkNode = item.bookmarkNode;
   chrome.bookmarks.update(bookmarkNode.id, {title: item.label});
   performGlobalUndo = null;  // This can't be undone, so disable global undo.
 }
 
 function handleEdit(e) {
   var item = e.target;
   var bookmarkNode = item.bookmarkNode;
   var context = {
     title: bookmarkNode.title
   };
   if (!bmm.isFolder(bookmarkNode))
     context.url = bookmarkNode.url;
 
   if (bookmarkNode.id == 'new') {
-    selectItemsAfterUserAction(list);
+    selectItemsAfterUserAction(/** @type {BookmarkList} */($('list')));
 
     // New page
     context.parentId = bookmarkNode.parentId;
     chrome.bookmarks.create(context, function(node) {
       // A new node was created and will get added to the list due to the
       // handler.
-      var dataModel = list.dataModel;
+      var dataModel = $('list').dataModel;
       var index = dataModel.indexOf(bookmarkNode);
       dataModel.splice(index, 1);
 
       // Select new item.
       var newIndex = dataModel.findIndexById(node.id);
       if (newIndex != -1) {
-        var sm = list.selectionModel;
-        list.scrollIndexIntoView(newIndex);
+        var sm = $('list').selectionModel;
+        $('list').scrollIndexIntoView(newIndex);
         sm.leadIndex = sm.anchorIndex = sm.selectedIndex = newIndex;
       }
     });
   } else {
     // Edit
     chrome.bookmarks.update(bookmarkNode.id, context);
   }
   performGlobalUndo = null;  // This can't be undone, so disable global undo.
 }
 
 function handleCancelEdit(e) {
   var item = e.target;
   var bookmarkNode = item.bookmarkNode;
   if (bookmarkNode.id == 'new') {
-    var dataModel = list.dataModel;
+    var dataModel = $('list').dataModel;
     var index = dataModel.findIndexById('new');
     dataModel.splice(index, 1);
   }
 }
 
 /**
  * Navigates to the folder that the selected item is in and selects it. This is
  * used for the show-in-folder command.
  */
 function showInFolder() {
-  var bookmarkNode = list.selectedItem;
+  var bookmarkNode = $('list').selectedItem;
   if (!bookmarkNode)
     return;
   var parentId = bookmarkNode.parentId;
 
   // After the list is loaded we should select the revealed item.
   function selectItem() {
-    var index = list.dataModel.findIndexById(bookmarkNode.id);
+    var index = $('list').dataModel.findIndexById(bookmarkNode.id);
     if (index == -1)
       return;
-    var sm = list.selectionModel;
+    var sm = $('list').selectionModel;
     sm.anchorIndex = sm.leadIndex = sm.selectedIndex = index;
-    list.scrollIndexIntoView(index);
+    $('list').scrollIndexIntoView(index);
   }
 
   var treeItem = bmm.treeLookup[parentId];
   treeItem.reveal();
 
   navigateTo(parentId, selectItem);
 }
 
 /**
  * @return {!cr.LinkController} The link controller used to open links based on
  *     user clicks and keyboard actions.
  */
 function getLinkController() {
   return linkController ||
       (linkController = new cr.LinkController(loadTimeData));
 }
 
 /**
  * Returns the selected bookmark nodes of the provided tree or list.
  * If |opt_target| is not provided or null the active element is used.
  * Only call this if the list or the tree is focused.
- * @param {BookmarkList|BookmarkTree} opt_target The target list or tree.
+ * @param {(BookmarkList|BookmarkTree)=} opt_target The target list or tree.
  * @return {!Array} Array of bookmark nodes.
  */
 function getSelectedBookmarkNodes(opt_target) {
-  return (opt_target || document.activeElement) == tree ?
-      tree.selectedFolders : list.selectedItems;
+  return (opt_target || document.activeElement) == $('tree') ?
+      $('tree').selectedFolders : $('list').selectedItems;
 }
 
 /**
  * @return {!Array.<string>} An array of the selected bookmark IDs.
  */
 function getSelectedBookmarkIds() {
   var selectedNodes = getSelectedBookmarkNodes();
   selectedNodes.sort(function(a, b) { return a.index - b.index });
   return selectedNodes.map(function(node) {
     return node.id;
   });
 }
 
 /**
  * @param {BookmarkTreeNode} node The node to test.
  * @return {boolean} Whether the given node is unmodifiable.
  */
 function isUnmodifiable(node) {
   return node && node.unmodifiable;
 }
 
 /**
- * @param {BookmarkList} A list of BookmarkNodes.
+ * @param {Array.<BookmarkTreeNode>} nodes A list of BookmarkTreeNodes.
  * @return {boolean} Whether any of the nodes is managed.
  */
 function hasUnmodifiable(nodes) {
   return nodes.some(isUnmodifiable);
 }
 
 /**
  * Opens the selected bookmarks.
- * @param {LinkKind} kind The kind of link we want to open.
- * @param {HTMLElement} opt_eventTarget The target of the user initiated event.
+ * @param {cr.LinkKind} kind The kind of link we want to open.
+ * @param {HTMLElement=} opt_eventTarget The target of the user initiated event.
  */
 function openBookmarks(kind, opt_eventTarget) {
   // If we have selected any folders, we need to find all the bookmarks one
   // level down. We use multiple async calls to getSubtree instead of getting
   // the whole tree since we would like to minimize the amount of data sent.
 
-  var urlsP = getUrlsForOpenCommands(opt_eventTarget);
+  var urlsP = getUrlsForOpenCommands(opt_eventTarget ? opt_eventTarget : null);
   urlsP.then(function(urls) {
-    getLinkController().openUrls(urls, kind);
+    getLinkController().openUrls(assert(urls), kind);
     chrome.bookmarkManagerPrivate.recordLaunch();
   });
 }
 
 /**
  * Opens an item in the list.
  */
 function openItem() {
   var bookmarkNodes = getSelectedBookmarkNodes();
   // If we double clicked or pressed enter on a single folder, navigate to it.
   if (bookmarkNodes.length == 1 && bmm.isFolder(bookmarkNodes[0]))
     navigateTo(bookmarkNodes[0].id);
   else
     openBookmarks(LinkKind.FOREGROUND_TAB);
 }
 
 /**
  * Refreshes search results after delete or undo-delete.
  * This ensures children of deleted folders do not remain in results
  */
 function updateSearchResults() {
-  if (list.isSearch()) {
-    list.reload();
+  if ($('list').isSearch()) {
+    $('list').reload();
   }
 }
 
 /**
  * Deletes the selected bookmarks. The bookmarks are saved in memory in case
  * the user needs to undo the deletion.
  */
 function deleteBookmarks() {
   var selectedIds = getSelectedBookmarkIds();
   var filteredIds = getFilteredSelectedBookmarkIds();
@@ skipping 17 matching lines @@
         performDelete();
         updateSearchResults();
       }
     });
   });
 }
 
 /**
  * Restores a tree of bookmarks under a specified folder.
  * @param {BookmarkTreeNode} node The node to restore.
- * @param {=string} parentId The ID of the folder to restore under. If not
- *     specified, the original parentId of the node will be used.
+ * @param {(string|number)=} opt_parentId If a string is passed, it's the ID of
+ *     the folder to restore under. If not specified or a number is passed (when
+ *     called by forEach), the original parentId of the node will be used.
  */
-function restoreTree(node, parentId) {
+function restoreTree(node, opt_parentId) {
   var bookmarkInfo = {
-    parentId: parentId || node.parentId,
+    parentId: typeof opt_parentId == 'string' ? opt_parentId : node.parentId,
     title: node.title,
     index: node.index,
     url: node.url
   };
 
   chrome.bookmarks.create(bookmarkInfo, function(result) {
     if (!result) {
       console.error('Failed to restore bookmark.');
       return;
     }
@@ skipping 21 matching lines @@
 
   // Only a single level of undo is supported, so disable global undo now.
   performGlobalUndo = null;
 }
 
 /**
  * Computes folder for "Add Page" and "Add Folder".
  * @return {string} The id of folder node where we'll create new page/folder.
  */
 function computeParentFolderForNewItem() {
-  if (document.activeElement == tree)
-    return list.parentId;
-  var selectedItem = list.selectedItem;
+  if (document.activeElement == $('tree'))
+    return $('list').parentId;
+  var selectedItem = $('list').selectedItem;
   return selectedItem && bmm.isFolder(selectedItem) ?
-      selectedItem.id : list.parentId;
+      selectedItem.id : $('list').parentId;
 }
 
 /**
  * Callback for rename folder and edit command. This starts editing for
  * selected item.
  */
 function editSelectedItem() {
-  if (document.activeElement == tree) {
-    tree.selectedItem.editing = true;
+  if (document.activeElement == $('tree')) {
+    $('tree').selectedItem.editing = true;
   } else {
-    var li = list.getListItem(list.selectedItem);
+    var li = $('list').getListItem($('list').selectedItem);
     if (li)
       li.editing = true;
   }
 }
 
 /**
  * Callback for the new folder command. This creates a new folder and starts
  * a rename of it.
  */
 function newFolder() {
   performGlobalUndo = null;  // This can't be undone, so disable global undo.
 
   var parentId = computeParentFolderForNewItem();
 
   // Callback is called after tree and list data model updated.
   function createFolder(callback) {
     chrome.bookmarks.create({
       title: loadTimeData.getString('new_folder_name'),
       parentId: parentId
     }, callback);
   }
 
-  if (document.activeElement == tree) {
+  if (document.activeElement == $('tree')) {
     createFolder(function(newNode) {
       navigateTo(newNode.id, function() {
         bmm.treeLookup[newNode.id].editing = true;
       });
     });
     return;
   }
 
   function editNewFolderInList() {
     createFolder(function() {
-      var index = list.dataModel.length - 1;
-      var sm = list.selectionModel;
+      var index = $('list').dataModel.length - 1;
+      var sm = $('list').selectionModel;
       sm.anchorIndex = sm.leadIndex = sm.selectedIndex = index;
       scrollIntoViewAndMakeEditable(index);
     });
   }
 
   navigateTo(parentId, editNewFolderInList);
 }
 
 /**
  * Scrolls the list item into view and makes it editable.
  * @param {number} index The index of the item to make editable.
  */
 function scrollIntoViewAndMakeEditable(index) {
-  list.scrollIndexIntoView(index);
+  $('list').scrollIndexIntoView(index);
   // onscroll is now dispatched asynchronously so we have to postpone
   // the rest.
   setTimeout(function() {
-    var item = list.getListItemByIndex(index);
+    var item = $('list').getListItemByIndex(index);
     if (item)
       item.editing = true;
-  });
+  }, 0);
 }
 
 /**
  * Adds a page to the current folder. This is called by the
  * add-new-bookmark-command handler.
  */
 function addPage() {
   var parentId = computeParentFolderForNewItem();
 
   function editNewBookmark() {
     var fakeNode = {
       title: '',
       url: '',
       parentId: parentId,
       id: 'new'
     };
-    var dataModel = list.dataModel;
+    var dataModel = $('list').dataModel;
     var length = dataModel.length;
     dataModel.splice(length, 0, fakeNode);
-    var sm = list.selectionModel;
+    var sm = $('list').selectionModel;
     sm.anchorIndex = sm.leadIndex = sm.selectedIndex = length;
     scrollIntoViewAndMakeEditable(length);
   };
 
   navigateTo(parentId, editNewBookmark);
 }
 
 /**
  * This function is used to select items after a user action such as paste, drop
  * add page etc.
  * @param {BookmarkList|BookmarkTree} target The target of the user action.
- * @param {=string} opt_selectedTreeId If provided, then select that tree id.
+ * @param {string=} opt_selectedTreeId If provided, then select that tree id.
  */
 function selectItemsAfterUserAction(target, opt_selectedTreeId) {
   // We get one onCreated event per item so we delay the handling until we get
   // no more events coming.
 
   var ids = [];
   var timer;
 
   function handle(id, bookmarkNode) {
     clearTimeout(timer);
-    if (opt_selectedTreeId || list.parentId == bookmarkNode.parentId)
+    if (opt_selectedTreeId || $('list').parentId == bookmarkNode.parentId)
       ids.push(id);
     timer = setTimeout(handleTimeout, 50);
   }
 
   function handleTimeout() {
     chrome.bookmarks.onCreated.removeListener(handle);
     chrome.bookmarks.onMoved.removeListener(handle);
 
     if (opt_selectedTreeId && ids.indexOf(opt_selectedTreeId) != -1) {
       var index = ids.indexOf(opt_selectedTreeId);
       if (index != -1 && opt_selectedTreeId in bmm.treeLookup) {
-        tree.selectedItem = bmm.treeLookup[opt_selectedTreeId];
+        $('tree').selectedItem = bmm.treeLookup[opt_selectedTreeId];
       }
-    } else if (target == list) {
-      var dataModel = list.dataModel;
+    } else if (target == $('list')) {
+      var dataModel = $('list').dataModel;
       var firstIndex = dataModel.findIndexById(ids[0]);
       var lastIndex = dataModel.findIndexById(ids[ids.length - 1]);
       if (firstIndex != -1 && lastIndex != -1) {
-        var selectionModel = list.selectionModel;
+        var selectionModel = $('list').selectionModel;
         selectionModel.selectedIndex = -1;
         selectionModel.selectRange(firstIndex, lastIndex);
         selectionModel.anchorIndex = selectionModel.leadIndex = lastIndex;
-        list.focus();
+        $('list').focus();
       }
     }
 
-    list.endBatchUpdates();
+    $('list').endBatchUpdates();
   }
 
-  list.startBatchUpdates();
+  $('list').startBatchUpdates();
 
   chrome.bookmarks.onCreated.addListener(handle);
   chrome.bookmarks.onMoved.addListener(handle);
   timer = setTimeout(handleTimeout, 300);
 }
 
 /**
  * Record user action.
  * @param {string} name An user action name.
  */
 function recordUserAction(name) {
   chrome.metricsPrivate.recordUserAction('BookmarkManager_Command_' + name);
 }
 
 /**
  * The currently selected bookmark, based on where the user is clicking.
  * @return {string} The ID of the currently selected bookmark (could be from
  *     tree view or list view).
  */
 function getSelectedId() {
-  if (document.activeElement == tree)
-    return tree.selectedItem.bookmarkId;
-  var selectedItem = list.selectedItem;
+  if (document.activeElement == $('tree'))
+    return $('tree').selectedItem.bookmarkId;
+  var selectedItem = $('list').selectedItem;
   return selectedItem && bmm.isFolder(selectedItem) ?
-      selectedItem.id : tree.selectedItem.bookmarkId;
+      selectedItem.id : $('tree').selectedItem.bookmarkId;
 }
 
 /**
  * Pastes the copied/cutted bookmark into the right location depending whether
  * if it was called from Organize Menu or from Context Menu.
  * @param {string} id The id of the element being pasted from.
  */
 function pasteBookmark(id) {
   recordUserAction('Paste');
-  selectItemsAfterUserAction(list);
+  selectItemsAfterUserAction(/** @type {BookmarkList} */($('list')));
   chrome.bookmarkManagerPrivate.paste(id, getSelectedBookmarkIds());
 }
 
 /**
  * Returns true if child is contained in another selected folder.
  * Traces parent nodes up the tree until a selected ancestor or root is found.
  */
 function hasSelectedAncestor(parentNode) {
   function contains(arr, item) {
     for (var i = 0; i < arr.length; i++)
         if (arr[i] === item)
           return true;
     return false;
   }
 
   // Don't search top level, cannot select permanent nodes in search.
   if (parentNode == null || parentNode.id <= 2)
     return false;
 
   // Found selected ancestor.
   if (contains(getSelectedBookmarkNodes(), parentNode))
     return true;
 
   // Keep digging.
-  return hasSelectedAncestor(tree.getBookmarkNodeById(parentNode.parentId));
+  return hasSelectedAncestor(
+      $('tree').getBookmarkNodeById(parentNode.parentId));
 }
 
 function getFilteredSelectedBookmarkIds() {
   // Remove duplicates from filteredIds and return.
   var filteredIds = new Array();
   // Selected nodes to iterate through for matches.
   var nodes = getSelectedBookmarkNodes();
 
   for (var i = 0; i < nodes.length; i++)
-    if (!hasSelectedAncestor(tree.getBookmarkNodeById(nodes[i].parentId)))
+    if (!hasSelectedAncestor($('tree').getBookmarkNodeById(nodes[i].parentId)))
       filteredIds.splice(0, 0, nodes[i].id);
 
   return filteredIds;
 }
 
 /**
  * Handler for the command event. This is used for context menu of list/tree
  * and organized menu.
  * @param {!Event} e The event object.
  */
@@ skipping 17 matching lines @@
         recordUserAction('UndoNone');
       }
       break;
     case 'show-in-folder-command':
       recordUserAction('ShowInFolder');
       showInFolder();
       break;
     case 'open-in-new-tab-command':
     case 'open-in-background-tab-command':
       recordUserAction('OpenInNewTab');
-      openBookmarks(LinkKind.BACKGROUND_TAB, e.target);
+      openBookmarks(LinkKind.BACKGROUND_TAB,
+          assertInstanceof(e.target, HTMLElement));
       break;
     case 'open-in-new-window-command':
       recordUserAction('OpenInNewWindow');
-      openBookmarks(LinkKind.WINDOW, e.target);
+      openBookmarks(LinkKind.WINDOW,
+          assertInstanceof(e.target, HTMLElement));
       break;
     case 'open-incognito-window-command':
       recordUserAction('OpenIncognito');
-      openBookmarks(LinkKind.INCOGNITO, e.target);
+      openBookmarks(LinkKind.INCOGNITO,
+          assertInstanceof(e.target, HTMLElement));
       break;
     case 'delete-command':
       recordUserAction('Delete');
       deleteBookmarks();
       break;
     case 'copy-command':
       recordUserAction('Copy');
       chrome.bookmarkManagerPrivate.copy(getSelectedBookmarkIds(),
                                          updatePasteCommand);
       break;
     case 'cut-command':
       recordUserAction('Cut');
       chrome.bookmarkManagerPrivate.cut(getSelectedBookmarkIds(),
                                         function() {
                                           updatePasteCommand();
                                           updateSearchResults();
                                         });
       break;
     case 'paste-from-organize-menu-command':
-      pasteBookmark(list.parentId);
+      pasteBookmark($('list').parentId);
       break;
     case 'paste-from-context-menu-command':
       pasteBookmark(getSelectedId());
       break;
     case 'sort-command':
       recordUserAction('Sort');
-      chrome.bookmarkManagerPrivate.sortChildren(list.parentId);
+      chrome.bookmarkManagerPrivate.sortChildren($('list').parentId);
       break;
     case 'rename-folder-command':
       editSelectedItem();
       break;
     case 'edit-command':
       recordUserAction('Edit');
       editSelectedItem();
       break;
     case 'new-folder-command':
       recordUserAction('NewFolder');
@@ skipping 12 matching lines @@
       undoDelete();
       break;
   }
 }
 
 // Execute the copy, cut and paste commands when those events are dispatched by
 // the browser. This allows us to rely on the browser to handle the keyboard
 // shortcuts for these commands.
 function installEventHandlerForCommand(eventName, commandId) {
   function handle(e) {
-    if (document.activeElement != list && document.activeElement != tree)
+    if (document.activeElement != $('list') &&
+        document.activeElement != $('tree'))
       return;
     var command = $(commandId);
     if (!command.disabled) {
       command.execute();
       if (e)
         e.preventDefault();  // Prevent the system beep.
     }
   }
   if (eventName == 'paste') {
     // Paste is a bit special since we need to do an async call to see if we
     // can paste because the paste command might not be up to date.
     document.addEventListener(eventName, function(e) {
       updatePasteCommand(handle);
     });
   } else {
     document.addEventListener(eventName, handle);
   }
 }
 
 function initializeSplitter() {
   var splitter = document.querySelector('.main > .splitter');
   Splitter.decorate(splitter);
 
   // The splitter persists the size of the left component in the local store.
-  if ('treeWidth' in localStorage)
-    splitter.previousElementSibling.style.width = localStorage['treeWidth'];
+  if ('treeWidth' in window.localStorage)
+    splitter.previousElementSibling.style.width =
+        window.localStorage['treeWidth'];
 
   splitter.addEventListener('resize', function(e) {
-    localStorage['treeWidth'] = splitter.previousElementSibling.style.width;
+    window.localStorage['treeWidth'] =
+        splitter.previousElementSibling.style.width;
   });
 }
 
 function initializeBookmarkManager() {
   // Sometimes the extension API is not initialized.
   if (!chrome.bookmarks)
     console.error('Bookmarks extension API is not available');
 
   chrome.bookmarkManagerPrivate.getStrings(continueInitializeBookmarkManager);
 }
 
 function continueInitializeBookmarkManager(localizedStrings) {
   loadLocalizedStrings(localizedStrings);
 
   bmm.treeLookup[searchTreeItem.bookmarkId] = searchTreeItem;
 
   cr.ui.decorate('menu', Menu);
   cr.ui.decorate('button[menu]', MenuButton);
   cr.ui.decorate('command', Command);
-  BookmarkList.decorate(list);
-  BookmarkTree.decorate(tree);
+  BookmarkList.decorate($('list'));
+  BookmarkTree.decorate($('tree'));
 
-  list.addEventListener('canceledit', handleCancelEdit);
-  list.addEventListener('canExecute', handleCanExecuteForList);
-  list.addEventListener('change', updateAllCommands);
-  list.addEventListener('contextmenu', updateEditingCommands);
-  list.addEventListener('dblclick', handleDoubleClickForList);
-  list.addEventListener('edit', handleEdit);
-  list.addEventListener('rename', handleRename);
-  list.addEventListener('urlClicked', handleUrlClickedForList);
+  $('list').addEventListener('canceledit', handleCancelEdit);
+  $('list').addEventListener('canExecute', handleCanExecuteForList);
+  $('list').addEventListener('change', updateAllCommands);
+  $('list').addEventListener('contextmenu', updateEditingCommands);
+  $('list').addEventListener('dblclick', handleDoubleClickForList);
+  $('list').addEventListener('edit', handleEdit);
+  $('list').addEventListener('rename', handleRename);
+  $('list').addEventListener('urlClicked', handleUrlClickedForList);
 
-  tree.addEventListener('canExecute', handleCanExecuteForTree);
-  tree.addEventListener('change', handleChangeForTree);
-  tree.addEventListener('contextmenu', updateEditingCommands);
-  tree.addEventListener('rename', handleRename);
-  tree.addEventListener('load', handleLoadForTree);
+  $('tree').addEventListener('canExecute', handleCanExecuteForTree);
+  $('tree').addEventListener('change', handleChangeForTree);
+  $('tree').addEventListener('contextmenu', updateEditingCommands);
+  $('tree').addEventListener('rename', handleRename);
+  $('tree').addEventListener('load', handleLoadForTree);
 
-  cr.ui.contextMenuHandler.addContextMenuProperty(tree);
-  list.contextMenu = $('context-menu');
-  tree.contextMenu = $('context-menu');
+  cr.ui.contextMenuHandler.addContextMenuProperty(
+      /** @type {!Element} */($('tree')));
+  $('list').contextMenu = $('context-menu');
+  $('tree').contextMenu = $('context-menu');
 
   // We listen to hashchange so that we can update the currently shown folder
   // when // the user goes back and forward in the history.
   window.addEventListener('hashchange', processHash);
 
-  document.querySelector('header form').onsubmit = function(e) {
+  document.querySelector('header form').onsubmit =
+      /** @type {function(Event=)} */(function(e) {
     setSearch($('term').value);
     e.preventDefault();
-  };
+  });
 
   $('term').addEventListener('search', handleSearch);
 
   document.querySelector('.summary button').addEventListener(
       'click', handleOrganizeButtonClick);
 
   document.addEventListener('canExecute', handleCanExecuteForDocument);
   document.addEventListener('command', handleCommand);
 
   // Listen to copy, cut and paste events and execute the associated commands.
@@ skipping 26 matching lines @@
   });
 
   chrome.bookmarkManagerPrivate.canOpenNewWindows(function(result) {
     canOpenNewWindows = result;
   });
 
   cr.ui.FocusOutlineManager.forDocument(document);
   initializeSplitter();
   bmm.addBookmarkModelListeners();
   dnd.init(selectItemsAfterUserAction);
-  tree.reload();
+  $('tree').reload();
 }
 
 initializeBookmarkManager();
 })();