MD Bookmarks: Add 'Open' command, to open in either the BMM or in new tabs

chrome/browser/resources/md_bookmarks/command_manager.js

 // Copyright 2017 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.
 
 /**
  * @fileoverview Element which shows context menus and handles keyboard
  * shortcuts.
  */
 cr.define('bookmarks', function() {
 
@@ skipping 39 matching lines @@
 
       /** @private {Object<Command, string>} */
       this.shortcuts_ = {};
       this.shortcuts_[Command.EDIT] = cr.isMac ? 'enter' : 'f2';
       this.shortcuts_[Command.COPY] = cr.isMac ? 'meta+c' : 'ctrl+c';
       this.shortcuts_[Command.DELETE] =
           cr.isMac ? 'delete backspace' : 'delete';
       this.shortcuts_[Command.OPEN_NEW_TAB] =
           cr.isMac ? 'meta+enter' : 'ctrl+enter';
       this.shortcuts_[Command.OPEN_NEW_WINDOW] = 'shift+enter';
+      this.shortcuts_[Command.OPEN] = cr.isMac ? 'meta+down' : 'enter';
     },
 
     detached: function() {
       CommandManager.instance_ = null;
       document.removeEventListener('open-item-menu', this.boundOnOpenItemMenu_);
       document.removeEventListener('keydown', this.boundOnKeydown_);
     },
 
     /**
      * Display the command context menu at (|x|, |y|) in window co-ordinates.
@@ skipping 26 matching lines @@
 
     /**
      * Determine if the |command| can be executed with the given |itemIds|.
      * Commands which appear in the context menu should be implemented
      * separately using `isCommandVisible_` and `isCommandEnabled_`.
      * @param {Command} command
      * @param {!Set<string>} itemIds
      * @return {boolean}
      */
     canExecute: function(command, itemIds) {
-      return this.isCommandVisible_(command, itemIds) &&
-          this.isCommandEnabled_(command, itemIds);
+      switch (command) {
+        case Command.OPEN:
+          return itemIds.size > 0;
+        default:
+          return this.isCommandVisible_(command, itemIds) &&
+              this.isCommandEnabled_(command, itemIds);
+      }
     },
 
     /**
      * @param {Command} command
      * @param {!Set<string>} itemIds
      * @return {boolean} True if the command should be visible in the context
      *     menu.
      */
     isCommandVisible_: function(command, itemIds) {
       switch (command) {
@@ skipping 52 matching lines @@
           chrome.bookmarkManagerPrivate.removeTrees(
               Array.from(this.minimizeDeletionSet_(itemIds)), function() {
                 // TODO(jiaxi): Add toast later.
               });
           break;
         case Command.OPEN_NEW_TAB:
         case Command.OPEN_NEW_WINDOW:
         case Command.OPEN_INCOGNITO:
           this.openUrls_(this.expandUrls_(itemIds), command);
           break;
+        case Command.OPEN:
+          var isFolder = itemIds.size == 1 &&
+              this.containsMatchingNode_(itemIds, function(node) {
+                return !node.url;
+              });
+          if (isFolder) {
+            var folderId = Array.from(itemIds)[0];
+            this.dispatch(bookmarks.actions.selectFolder(
+                folderId, this.getState().nodes));
+          } else {
+            this.openUrls_(this.expandUrls_(itemIds), command);
+          }
+          break;

[calamity, 2017/05/17 05:09:22]

Can we also add a

default:
  assert(false);

here?

[tsergeant, 2017/05/17 07:04:38]

Done.

       }
     },
 
     ////////////////////////////////////////////////////////////////////////////
     // Private functions:
 
     /**
      * Minimize the set of |itemIds| by removing any node which has an ancestor
      * node already in the set. This ensures that instead of trying to delete
      * both a node and its descendant, we will only try to delete the topmost
@@ skipping 17 matching lines @@
       return minimizedSet;
     },
 
     /**
      * @param {!Array<string>} urls
      * @param {Command} command
      * @private
      */
     openUrls_: function(urls, command) {
       assert(
-          command == Command.OPEN_NEW_TAB ||
+          command == Command.OPEN || command == Command.OPEN_NEW_TAB ||
           command == Command.OPEN_NEW_WINDOW ||
           command == Command.OPEN_INCOGNITO);
 
       if (urls.length == 0)
         return;
 
       var incognito = command == Command.OPEN_INCOGNITO;
       if (command == Command.OPEN_NEW_WINDOW || incognito) {
         chrome.windows.create({url: urls, incognito: incognito});
       } else {
+        if (command == Command.OPEN)
+          chrome.tabs.create({url: urls.shift(), active: true});
         urls.forEach(function(url) {
           chrome.tabs.create({url: url, active: false});
         });
       }
     },
 
     /**
      * Returns all URLs in the given set of nodes and their immediate children.
      * Note that these will be ordered by insertion order into the |itemIds|
      * set, and that it is possible to duplicate a URL by passing in both the
@@ skipping 148 matching lines @@
 
   /** @return {!bookmarks.CommandManager} */
   CommandManager.getInstance = function() {
     return assert(CommandManager.instance_);
   };
 
   return {
     CommandManager: CommandManager,
   };
 });