DevTools: eliminate ToolbarButton.setState method; cleanup toolbar.css

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

Index: third_party/WebKit/Source/devtools/front_end/ui/FilterBar.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/FilterBar.js b/third_party/WebKit/Source/devtools/front_end/ui/FilterBar.js
index 56531b870cb3f6384b4b94373c430a91df77374d..7701205c18e7b11ffdc2e5032ead11df3f99a2ed 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/FilterBar.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/FilterBar.js
@@ -43,7 +43,7 @@ WebInspector.FilterBar = class extends WebInspector.HBox {
     this._enabled = true;
     this.element.classList.add('filter-bar');
 
-    this._filterButton = new WebInspector.ToolbarButton(WebInspector.UIString('Filter'), 'filter-toolbar-item');
+    this._filterButton = new WebInspector.ToolbarToggle(WebInspector.UIString('Filter'), 'filter-toolbar-item');
     this._filterButton.addEventListener('click', this._handleFilterButtonClick, this);
 
     this._filters = [];
@@ -94,20 +94,6 @@ WebInspector.FilterBar = class extends WebInspector.HBox {
     this._updateFilterButton();
   }
 
-  /**
-   * @return {string}
-   */
-  _filterBarState() {
-    if (this._filtersShown)
-      return WebInspector.FilterBar.FilterBarState.Shown;
-    var isActive = false;
-    for (var i = 0; i < this._filters.length; ++i) {
-      if (this._filters[i].isActive())
-        return WebInspector.FilterBar.FilterBarState.Active;
-    }
-    return WebInspector.FilterBar.FilterBarState.Inactive;
-  }
-
   _updateFilterBar() {
     var visible = this._alwaysShowFilters || (this._filtersShown && this._enabled);
     this.element.classList.toggle('hidden', !visible);
@@ -123,7 +109,16 @@ WebInspector.FilterBar = class extends WebInspector.HBox {
   }
 
   _updateFilterButton() {
-    this._filterButton.setState(this._filterBarState());
+    if (this._filtersShown) {
+      this._filterButton.setToggled(true);
+      this._filterButton.setActive(false);
+      return;
+    }
+    this._filterButton.setToggled(false);
+    var isActive = false;
+    for (var filter of this._filters)
+      isActive = isActive || filter.isActive();
+    this._filterButton.setActive(isActive);
   }
 
   /**