MD Bookmarks: Disable 'Open in Incognito Window' when Incognito is disabled

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 71 matching lines @@
      * Display the command context menu positioned to cover the |target|
      * element. Commands will execute on the currently selected items.
      * @param {!Element} target
      */
     openCommandMenuAtElement: function(target) {
       this.menuIds_ = this.getState().selection.items;
       /** @type {!CrActionMenuElement} */ (this.$.dropdown).showAt(target);
     },
 
     closeCommandMenu: function() {
+      this.menuIds_ = new Set();

[calamity, 2017/05/29 06:52:27]

Does this functionally change anything, or is it just data cleanup?

[tsergeant, 2017/05/30 00:18:21]

Menu item bindings are based entirely on the menuIds_ set, so clearing it each
time the menu is closed forces the menu items to update each time the menu is
opened.

[calamity, 2017/06/01 04:07:44]

I see. So menu items that have enable conditions that could have changed since
the last right click on the items will update properly?

[tsergeant, 2017/06/01 05:27:16]

Yup, exactly.

       /** @type {!CrActionMenuElement} */ (this.$.dropdown).close();
     },
 
     ////////////////////////////////////////////////////////////////////////////
     // Command handlers:
 
     /**
      * 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_`.
@@ skipping 39 matching lines @@
     /**
      * @param {Command} command
      * @param {!Set<string>} itemIds
      * @return {boolean} True if the command should be clickable in the context
      *     menu.
      */
     isCommandEnabled_: function(command, itemIds) {
       switch (command) {
         case Command.OPEN_NEW_TAB:
         case Command.OPEN_NEW_WINDOW:
+          return this.expandUrls_(itemIds).length > 0;
         case Command.OPEN_INCOGNITO:
-          return this.expandUrls_(itemIds).length > 0;
+          return this.expandUrls_(itemIds).length > 0 &&
+              this.getState().prefs.incognito != IncognitoAvailability.DISABLED;
         default:
           return true;
       }
     },
 
     /**
      * @param {Command} command
      * @param {!Set<string>} itemIds
      */
     handle: function(command, itemIds) {
@@ skipping 144 matching lines @@
       } else {
         this.openCommandMenuAtPosition(e.detail.x, e.detail.y);
       }
     },
 
     /**
      * @param {Event} e
      * @private
      */
     onCommandClick_: function(e) {
+      this.handle(e.target.getAttribute('command'), assert(this.menuIds_));
       this.closeCommandMenu();
-      this.handle(e.target.getAttribute('command'), assert(this.menuIds_));
     },
 
     /**
      * @param {!Event} e
      * @private
      */
     onKeydown_: function(e) {
       var selection = this.getState().selection.items;
       // TODO(tsergeant): Prevent keyboard shortcuts when a dialog is open or
       // text field is focused.
@@ skipping 15 matching lines @@
      * Close the menu on mousedown so clicks can propagate to the underlying UI.
      * This allows the user to right click the list while a context menu is
      * showing and get another context menu.
      * @param {Event} e
      * @private
      */
     onMenuMousedown_: function(e) {
       if (e.path[0] != this.$.dropdown)
         return;
 
-      this.$.dropdown.close();
+      this.closeCommandMenu();
     },
 
     /**
      * @param {Command} command
      * @return {string}
      * @private
      */
     getCommandLabel_: function(command) {
       var multipleNodes = this.menuIds_.size > 1 ||
           this.containsMatchingNode_(this.menuIds_, function(node) {
             return !node.url;
           });
       var label;
       switch (command) {
         case Command.EDIT:
-          if (this.menuIds_.size > 1)
+          if (this.menuIds_.size != 1)
             return '';
 
           var id = Array.from(this.menuIds_)[0];
           var itemUrl = this.getState().nodes[id].url;
           label = itemUrl ? 'menuEdit' : 'menuRename';
           break;
         case Command.COPY:
           label = 'menuCopyURL';
           break;
         case Command.DELETE:
@@ skipping 28 matching lines @@
 
   /** @return {!bookmarks.CommandManager} */
   CommandManager.getInstance = function() {
     return assert(CommandManager.instance_);
   };
 
   return {
     CommandManager: CommandManager,
   };
 });