Merge 116672 - Web Inspector: search title is shown beside the search field (not under) in the vert…

Source/WebCore/inspector/front-end/SearchController.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 18 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  */
 WebInspector.SearchController = function()
 {
     this.element = document.getElementById("search");
     this._matchesElement = document.getElementById("search-results-matches");
-    this._toolbarLabelElement = document.getElementById("search-toolbar-label");
+    this._searchItemElement = document.getElementById("toolbar-search-item");
     this._searchControlBoxElement = document.getElementById("toolbar-search-navigation-control");
 
     this.element.addEventListener("search", this._onSearch.bind(this), false); // when the search is emptied
     this.element.addEventListener("mousedown", this._onSearchFieldManualFocus.bind(this), false); // when the search field is manually selected
     this.element.addEventListener("keydown", this._onKeyDown.bind(this), true);
    
     this._populateSearchNavigationButtons();
 }
 
 WebInspector.SearchController.prototype = {
@@ skipping 13 matching lines @@
         if (panel === WebInspector.inspectorView.currentPanel())
             this._updateSearchMatchesCountAndCurrentMatchIndex(panel.currentSearchMatches, currentMatchIndex);
     },
 
     updateSearchLabel: function()
     {
         var panelName = WebInspector.inspectorView.currentPanel() && WebInspector.inspectorView.currentPanel().toolbarItemLabel;
         if (!panelName)
             return;
         var newLabel = WebInspector.UIString("Search %s", panelName);
-        if (WebInspector.isCompactMode())
-            this.element.setAttribute("placeholder", newLabel);
-        else {
-            this.element.removeAttribute("placeholder");
-            this._toolbarLabelElement.textContent = newLabel;
-        }
+        this.element.setAttribute("placeholder", newLabel);
     },
 
     cancelSearch: function()
     {
         this.element.value = "";
         this._performSearch("");
     },
 
     disableSearchUntilExplicitAction: function(event)
     {
@@ skipping 60 matching lines @@
             // Perform the search on a timeout so the panel switches fast.
             setTimeout(performPanelSearch.bind(this), 0);
         } else {
             // Update to show Not found for panels that can't be searched.
             this._updateSearchMatchesCountAndCurrentMatchIndex();
         }
     },
 
     _updateSearchNavigationButtonState: function(visible)
     {
-        if (visible) {
-            this._searchNavigationNext.removeStyleClass("hidden");
-            this._searchNavigationPrev.removeStyleClass("hidden");
-        } else {
-            this._searchNavigationNext.addStyleClass("hidden");
-            this._searchNavigationPrev.addStyleClass("hidden");
-        }
+        if (visible)
+            this._searchItemElement.addStyleClass("with-navigation-buttons");
+        else
+            this._searchItemElement.removeStyleClass("with-navigation-buttons");
     },
 
     /**
      * @param {?number=} matches
      * @param {number=} currentMatchIndex
      */
     _updateSearchMatchesCountAndCurrentMatchIndex: function(matches, currentMatchIndex)
     {
         if (matches == null) {
             this._matchesElement.addStyleClass("hidden");
@@ skipping 155 matching lines @@
     },
 
     /**
      * @param {string=} direction
      */ 
     _createSearchNavigationButton: function(direction) 
     {
         var searchNavigationControlElement = document.createElement("div");
         var searchNavigationIconElement = document.createElement("div");
         
-        searchNavigationControlElement.className = "toolbar-search-navigation-label hidden";
+        searchNavigationControlElement.className = "toolbar-search-navigation-label";
         
         switch (direction) {
         case "prev":
             var searchTitle = WebInspector.UIString("Search Previous");
             searchNavigationIconElement.className = "toolbar-search-navigation-icon-prev";
             this._searchNavigationPrev = searchNavigationControlElement;
             this._searchNavigationPrev.addEventListener("mousedown", this._onPrevButtonSearch.bind(this), false);
             break;
              
         case "next":
@@ skipping 14 matching lines @@
         // Lazily adding search navigation keys to dom.
         this._createSearchNavigationButton("prev");
         this._createSearchNavigationButton("next");
     }
 }
 
 /**
  * @type {?WebInspector.SearchController}
  */
 WebInspector.searchController = null;