[DevTools] Rework some focus code.

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

Index: third_party/WebKit/Source/devtools/front_end/ui/TextPrompt.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/TextPrompt.js b/third_party/WebKit/Source/devtools/front_end/ui/TextPrompt.js
index 2701d7c6358e2a4a5ea1780ea049095d8881a8d0..6ea050da5856cb8204286385ba05e3c5ea893ac2 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/TextPrompt.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/TextPrompt.js
@@ -153,7 +153,7 @@ WebInspector.TextPrompt.prototype = {
         this._proxyElement.remove();
         delete this._proxyElement;
         this._element.classList.remove("text-prompt");
-        WebInspector.restoreFocusFromElement(this._element);
+        this._savedFocus = WebInspector.restoreFocusedElement(this._element, this._savedFocus);
     },
 
     /**
@@ -241,7 +241,7 @@ WebInspector.TextPrompt.prototype = {
         this._oldTabIndex = this._element.tabIndex;
         if (this._element.tabIndex < 0)
             this._element.tabIndex = 0;
-        WebInspector.setCurrentFocusElement(this._element);
+        this._savedFocus = WebInspector.saveFocusedElement(this._element);
         if (!this.text())
             this._updateAutoComplete();
     },