DevTools: fix focus restoration from command menu

third_party/WebKit/Source/devtools/front_end/ui/Dialog.js

Index: third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js b/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
index fb24054e2b1d37c9310d8bb171060efd496cb07c..2fa46c1052653a502164f9d8413d6a5e9dc475d8 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/Dialog.js
@@ -73,7 +73,7 @@ WebInspector.Dialog.prototype = {
 
         this._glassPane = new WebInspector.GlassPane(document, this._dimmed);
         this._glassPane.element.addEventListener("click", this._onGlassPaneClick.bind(this), false);
-        WebInspector.GlassPane.DefaultFocusedViewStack.push(this);
+        WebInspector.GlassPane.DefaultFocusedViewStack.push(WebInspector.currentFocusElement() || WebInspector.inspectorView);

[dgozman, 2016/04/28 01:28:29]

This makes me think whether we should unify DefaultFocusedViewStack and
currentFocusElement? Looks like there is no need to have them both.

 
         WebInspector.Widget.prototype.show.call(this, this._glassPane.element);
 
@@ -87,9 +87,8 @@ WebInspector.Dialog.prototype = {
     detach: function()
     {
         WebInspector.Widget.prototype.detach.call(this);
-
-        WebInspector.GlassPane.DefaultFocusedViewStack.pop();
         this._glassPane.dispose();
+        WebInspector.GlassPane.DefaultFocusedViewStack.pop();
         delete this._glassPane;
 
         this._restoreTabIndexOnElements();