[MD Bookmarks] Restore focus after closing a dialog or context menu.

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 91 matching lines @@
     /**
      * Display the command context menu at (|x|, |y|) in window co-ordinates.
      * Commands will execute on |items| if given, or on the currently selected
      * items.
      * @param {number} x
      * @param {number} y
      * @param {Set<string>=} items
      */
     openCommandMenuAtPosition: function(x, y, items) {
       this.menuIds_ = items || this.getState().selection.items;
+
       var dropdown =
           /** @type {!CrActionMenuElement} */ (this.$.dropdown.get());
       // Ensure that the menu is fully rendered before trying to position it.
       Polymer.dom.flush();
-      dropdown.showAtPosition({top: y, left: x});
+      bookmarks.DialogFocusManager.getInstance().showDialog(
+          dropdown, function() {
+            dropdown.showAtPosition({top: y, left: x});
+          });
     },
 
     /**
      * 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;
+
       var dropdown =
           /** @type {!CrActionMenuElement} */ (this.$.dropdown.get());
       // Ensure that the menu is fully rendered before trying to position it.
       Polymer.dom.flush();
-      dropdown.showAt(target);
+      bookmarks.DialogFocusManager.getInstance().showDialog(
+          dropdown, function() {
+            dropdown.showAt(target);
+          });
     },
 
     closeCommandMenu: function() {
       this.menuIds_ = new Set();
       /** @type {!CrActionMenuElement} */ (this.$.dropdown.get()).close();
     },
 
     ////////////////////////////////////////////////////////////////////////////
     // Command handlers:
 
@@ skipping 236 matching lines @@
 
       if (urls.length <= OPEN_CONFIRMATION_LIMIT) {
         openUrlsCallback();
         return;
       }
 
       this.confirmOpenCallback_ = openUrlsCallback;
       var dialog = this.$.openDialog.get();
       dialog.querySelector('.body').textContent =
           loadTimeData.getStringF('openDialogBody', urls.length);
-      dialog.showModal();
+
+      bookmarks.DialogFocusManager.getInstance().showDialog(
+          this.$.openDialog.get());
     },
 
     /**
      * 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
      * parent ID and child ID.
      * @param {!Set<string>} itemIds
      * @return {!Array<string>}
      * @private
@@ skipping 186 matching lines @@
 
   /** @return {!bookmarks.CommandManager} */
   CommandManager.getInstance = function() {
     return assert(CommandManager.instance_);
   };
 
   return {
     CommandManager: CommandManager,
   };
 });