DevTools: update buttons to new style

third_party/WebKit/Source/devtools/front_end/ui/SearchableView.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 31 matching lines @@
     this.registerRequiredCSS('ui/searchableView.css');
     this.element[UI.SearchableView._symbol] = this;
 
     this._searchProvider = searchable;
     this._setting = settingName ? Common.settings.createSetting(settingName, {}) : null;
 
     this.contentElement.createChild('content');
     this._footerElementContainer = this.contentElement.createChild('div', 'search-bar hidden');
     this._footerElementContainer.style.order = 100;
 
-    var toolbar = new UI.Toolbar('search-toolbar', this._footerElementContainer);
+    var toolbar = new UI.Toolbar('', this._footerElementContainer);
 
     if (this._searchProvider.supportsCaseSensitiveSearch()) {
       this._caseSensitiveButton = new UI.ToolbarToggle(Common.UIString('Case sensitive'), '');
       this._caseSensitiveButton.setText('Aa');
       this._caseSensitiveButton.addEventListener(UI.ToolbarButton.Events.Click, this._toggleCaseSensitiveSearch, this);
       toolbar.appendToolbarItem(this._caseSensitiveButton);
     }
 
     if (this._searchProvider.supportsRegexSearch()) {
       this._regexButton = new UI.ToolbarToggle(Common.UIString('Regex'), '');
@@ skipping 33 matching lines @@
     this._searchInputElement.addEventListener('input', this._onInput.bind(this), false);
 
     this._replaceInputElement =
         searchInputElements.createChild('input', 'search-replace toolbar-replace-control hidden');
     this._replaceInputElement.addEventListener('keydown', this._onReplaceKeyDown.bind(this), true);
     this._replaceInputElement.placeholder = Common.UIString('Replace');
 
     // Build the buttons (Find, Previous, Replace, Replace All).
     this._buttonsContainer = this._footerElement.createChild('div', 'toolbar-search-buttons hidden');
 
-    var findButtonElement = this._buttonsContainer.createChild('button', 'search-action-button');
-    findButtonElement.textContent = Common.UIString('Find');
-    findButtonElement.tabIndex = -1;
-    findButtonElement.addEventListener('click', this._onFindClick.bind(this), false);
-
-    var prevButtonElement = this._buttonsContainer.createChild('button', 'search-action-button');

[dgozman, 2017/05/15 21:29:00]

Let's remove these in a separate patch.

[luoe, 2017/05/18 21:29:26]

Done.

-    prevButtonElement.textContent = Common.UIString('Previous');
-    prevButtonElement.tabIndex = -1;
-    prevButtonElement.addEventListener('click', this._onPreviousClick.bind(this), false);
-
-    this._replaceButtonElement = this._buttonsContainer.createChild('button', 'search-action-button');
-    this._replaceButtonElement.textContent = Common.UIString('Replace');
+    this._replaceButtonElement =
+        UI.createTextButton(Common.UIString('Replace'), this._replace.bind(this), 'search-action-button');
     this._replaceButtonElement.disabled = true;
     this._replaceButtonElement.tabIndex = -1;
-    this._replaceButtonElement.addEventListener('click', this._replace.bind(this), false);
+    this._buttonsContainer.appendChild(this._replaceButtonElement);
 
-    var replaceAllButtonElement = this._buttonsContainer.createChild('button', 'search-action-button');
-    replaceAllButtonElement.textContent = Common.UIString('Replace All');
-    replaceAllButtonElement.addEventListener('click', this._replaceAll.bind(this), false);
+    var replaceAllButtonElement =
+        UI.createTextButton(Common.UIString('Replace All'), this._replaceAll.bind(this), 'search-action-button');
+    this._buttonsContainer.appendChild(replaceAllButtonElement);
 
     // Build the replace checkbox and cancel button.
     this._replaceElement = this._footerElement.createChild('div').createChild('span', 'toolbar-replace-checkbox');
 
     var replaceLabelElement = UI.CheckboxLabel.create(Common.UIString('Replace'));
     this._replaceCheckboxElement = replaceLabelElement.checkboxElement;
-    var uniqueId = ++UI.SearchableView._lastUniqueId;
-    var replaceCheckboxId = 'search-replace-trigger' + uniqueId;
-    this._replaceCheckboxElement.id = replaceCheckboxId;
     this._replaceCheckboxElement.addEventListener('change', this._updateSecondRowVisibility.bind(this), false);
 
     this._replaceElement.appendChild(replaceLabelElement);
 
-    var cancelButtonElement = this._footerElement.createChild('div').createChild('button', 'search-action-button');
-    cancelButtonElement.textContent = Common.UIString('Cancel');
+    var cancelButtonElement =
+        UI.createTextButton(Common.UIString('Cancel'), this.closeSearch.bind(this), 'search-action-button');
     cancelButtonElement.tabIndex = -1;
-    cancelButtonElement.addEventListener('click', this.closeSearch.bind(this), false);
     this._minimalSearchQuerySize = 3;
+    this._footerElement.createChild('div').appendChild(cancelButtonElement);
 
     this._loadSetting();
   }
 
   /**
    * @param {?Element} element
    * @return {?UI.SearchableView}
    */
   static fromElement(element) {
     var view = null;
@@ skipping 350 matching lines @@
   }
 
   _onValueChanged() {
     if (!this._searchIsVisible)
       return;
     delete this._valueChangedTimeoutId;
     this._performSearch(false, true);
   }
 };
 
 UI.SearchableView._lastUniqueId = 0;

[dgozman, 2017/05/15 21:29:00]

Remove this one as well.

 
 UI.SearchableView._symbol = Symbol('searchableView');
 
 
 /**
  * @interface
  */
 UI.Searchable = function() {};
 
 UI.Searchable.prototype = {
@@ skipping 77 matching lines @@
       // Silent catch.
     }
 
     // Otherwise just do a plain text search.
     if (!regex)
       regex = createPlainTextSearchRegex(query, modifiers);
 
     return regex;
   }
 };