[DevTools] Rework some focus code.

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

Index: third_party/WebKit/Source/devtools/front_end/ui/SearchableView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/SearchableView.js b/third_party/WebKit/Source/devtools/front_end/ui/SearchableView.js
index 1d07127968c558d94888cf20f6bbf88f5b29d86d..d68913b3b4b5fbe13f96aa64cd9a1783ad3380de 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/SearchableView.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/SearchableView.js
@@ -94,7 +94,6 @@ WebInspector.SearchableView = function(searchable, settingName)
     this._searchNavigationNextElement.addEventListener("click", this._onNextButtonSearch.bind(this), false);
     this._searchNavigationNextElement.title = WebInspector.UIString("Search Next");
 
-    this._searchInputElement.addEventListener("mousedown", this._onSearchFieldManualFocus.bind(this), false); // when the search field is manually selected
     this._searchInputElement.addEventListener("keydown", this._onSearchKeyDown.bind(this), true);
     this._searchInputElement.addEventListener("input", this._onInput.bind(this), false);
 
@@ -250,7 +249,7 @@ WebInspector.SearchableView.prototype = {
     closeSearch: function()
     {
         this.cancelSearch();
-        if (WebInspector.currentFocusElement() && WebInspector.currentFocusElement().isDescendant(this._footerElementContainer))
+        if (this._footerElementContainer.hasFocus())
             this.focus();
     },
 
@@ -364,7 +363,7 @@ WebInspector.SearchableView.prototype = {
             this.cancelSearch();
 
         var queryCandidate;
-        if (WebInspector.currentFocusElement() !== this._searchInputElement) {
+        if (!this._searchInputElement.hasFocus()) {
             var selection = this._searchInputElement.getComponentSelection();
             if (selection.rangeCount)
                 queryCandidate = selection.toString().replace(/\r?\n.*/, "");
@@ -392,14 +391,6 @@ WebInspector.SearchableView.prototype = {
     /**
      * @param {!Event} event
      */
-    _onSearchFieldManualFocus: function(event)
-    {
-        WebInspector.setCurrentFocusElement(/** @type {?Node} */ (event.target));
-    },
-
-    /**
-     * @param {!Event} event
-     */
     _onSearchKeyDown: function(event)
     {
         if (isEscKey(event)) {