[DevTools] Rework some focus code.

third_party/WebKit/Source/devtools/front_end/components/DockController.js

Index: third_party/WebKit/Source/devtools/front_end/components/DockController.js
diff --git a/third_party/WebKit/Source/devtools/front_end/components/DockController.js b/third_party/WebKit/Source/devtools/front_end/components/DockController.js
index e04e202e9b22cb02a936442390b1bfae306040f2..19be63370bda47e9dbe3f1d80ae4fb9495e7256b 100644
--- a/third_party/WebKit/Source/devtools/front_end/components/DockController.js
+++ b/third_party/WebKit/Source/devtools/front_end/components/DockController.js
@@ -114,6 +114,7 @@ WebInspector.DockController.prototype = {
 
     /**
      * @param {string} dockSide
+     * @suppressGlobalPropertiesCheck
      */
     setDockSide: function(dockSide)
     {
@@ -126,7 +127,7 @@ WebInspector.DockController.prototype = {
         if (this._dockSide)
             this._lastDockStateSetting.set(this._dockSide);
 
-        WebInspector.DockController._previousFocusedElement = WebInspector.currentFocusElement();
+        this._savedFocus = document.deepActiveElement();
         var eventData = { from: this._dockSide, to: dockSide };
         this.dispatchEventToListeners(WebInspector.DockController.Events.BeforeDockSideChanged, eventData);
         console.timeStamp("DockController.setIsDocked");
@@ -143,10 +144,10 @@ WebInspector.DockController.prototype = {
     _setIsDockedResponse: function(eventData)
     {
         this.dispatchEventToListeners(WebInspector.DockController.Events.AfterDockSideChanged, eventData);
-
-        if (WebInspector.DockController._previousFocusedElement)
-            WebInspector.DockController._previousFocusedElement.focus();
-        delete WebInspector.DockController._previousFocusedElement;
+        if (this._savedFocus) {
+            this._savedFocus.focus();
+            this._savedFocus = null;
+        }
     },
 
     /**