Ignore mouseup shortly after showing cr.ui.Menu

ui/webui/resources/js/cr/ui/menu_button.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.
 
 // <include src="../../assert.js">
 
 cr.exportPath('cr.ui');
 
 /**
  * Enum for type of hide. Delayed is used when called by clicking on a
@@ skipping 92 matching lines @@
                 !this.menu.contains(e.target)) {
               this.hideMenu();
             } else {
               e.preventDefault();
             }
           } else {
             if (this.isMenuShown()) {
               this.hideMenu();
             } else if (e.button == 0) {  // Only show the menu when using left
                                          // mouse button.
-              this.showMenu(false);
+              this.showMenu(false, {x: e.screenX, y: e.screenY});
 
               // Prevent the button from stealing focus on mousedown.
               e.preventDefault();
             }
           }
 
           // Hide the focus ring on mouse click.
           this.classList.add('using-mouse');
           break;
         case 'keydown':
@@ skipping 27 matching lines @@
           if (!(e.target == this.menu || this.menu.contains(e.target)))
             this.hideMenu();
           break;
         case 'popstate':
         case 'resize':
           this.hideMenu();
           break;
         case 'contextmenu':
           if ((!this.menu || !this.menu.contains(e.target)) &&
               (!this.hideTimestamp_ || Date.now() - this.hideTimestamp_ > 50))
-            this.showMenu(true);
+            this.showMenu(true, {x: e.screenX, y: e.screenY});
           e.preventDefault();
           // Don't allow elements further up in the DOM to show their menus.
           e.stopPropagation();
           break;
         case 'dblclick':
           // Don't allow double click events to propagate.
           e.preventDefault();
           e.stopPropagation();
           break;
       }
     },
 
     /**
      * Shows the menu.
      * @param {boolean} shouldSetFocus Whether to set focus on the
      *     selected menu item.
+     * @param {{x: number, y: number}=} opt_mousePos The position of the mouse
+     *     when shown (in screen coordinates).
      */
-    showMenu: function(shouldSetFocus) {
+    showMenu: function(shouldSetFocus, opt_mousePos) {
       this.hideMenu();
 
       this.menu.updateCommands(this);
 
       var event = new UIEvent('menushow',{
         bubbles: true,
         cancelable: true,
         view: window
       });
       if (!this.dispatchEvent(event))
         return;
 
-      this.menu.hidden = false;
+      this.menu.show(opt_mousePos);
 
       this.setAttribute('menu-shown', '');
 
       // When the menu is shown we steal all keyboard events.
       var doc = this.ownerDocument;
       var win = doc.defaultView;
       this.showingEvents_.add(doc, 'keydown', this, true);
       this.showingEvents_.add(doc, 'mousedown', this, true);
       this.showingEvents_.add(doc, 'focus', this, true);
       this.showingEvents_.add(doc, 'scroll', this, true);
@@ skipping 15 matching lines @@
      */
     hideMenu: function(opt_hideType) {
       if (!this.isMenuShown())
         return;
 
       this.removeAttribute('menu-shown');
       if (opt_hideType == HideType.DELAYED)
         this.menu.classList.add('hide-delayed');
       else
         this.menu.classList.remove('hide-delayed');
-      this.menu.hidden = true;
+      this.menu.hide();
 
       this.showingEvents_.removeAll();
       this.focus();
 
       var event = new UIEvent('menuhide', {
         bubbles: true,
         cancelable: false,
         view: window
       });
       this.dispatchEvent(event);
@@ skipping 43 matching lines @@
           break;
       }
     }
   };
 
   // Export
   return {
     MenuButton: MenuButton,
   };
 });