DevTools: move the filtered items caption into the toolbar.

third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 42 matching lines @@
     /**
      * @type {!Array.<!Console.ConsoleView.RegexMatchRange>}
      */
     this._regexMatchRanges = [];
     this._filter = new Console.ConsoleViewFilter(this._updateMessageList.bind(this));
 
     this._executionContextComboBox = new UI.ToolbarComboBox(null, 'console-context');
     this._executionContextComboBox.setMaxWidth(80);
     this._consoleContextSelector = new Console.ConsoleContextSelector(this._executionContextComboBox.selectElement());
 
+    this._filterStatusText = new UI.ToolbarText();
+    this._filterStatusText.element.classList.add('dimmed');
     this._showSettingsPaneSetting = Common.settings.createSetting('consoleShowSettingsToolbar', false);
     this._showSettingsPaneButton = new UI.ToolbarSettingToggle(
         this._showSettingsPaneSetting, 'largeicon-settings-gear', Common.UIString('Console settings'));
-
     this._progressToolbarItem = new UI.ToolbarItem(createElement('div'));
 
     var toolbar = new UI.Toolbar('', this._contentsElement);
     toolbar.appendToolbarItem(UI.Toolbar.createActionButton(
         /** @type {!UI.Action }*/ (UI.actionRegistry.action('console.clear'))));
     toolbar.appendSeparator();
     toolbar.appendToolbarItem(this._executionContextComboBox);
     toolbar.appendSeparator();
     toolbar.appendToolbarItem(this._filter._textFilterUI);
     toolbar.appendToolbarItem(this._filter._levelComboBox);
     toolbar.appendToolbarItem(this._progressToolbarItem);
     toolbar.appendSpacer();
-    toolbar.appendText('');
+    toolbar.appendToolbarItem(this._filterStatusText);
     toolbar.appendSeparator();
     toolbar.appendToolbarItem(this._showSettingsPaneButton);
 
     this._preserveLogCheckbox = new UI.ToolbarSettingCheckbox(
         Common.moduleSetting('preserveConsoleLog'), Common.UIString('Do not clear log on page reload / navigation'),
         Common.UIString('Preserve log'));
     this._hideNetworkMessagesCheckbox = new UI.ToolbarSettingCheckbox(
         this._filter._hideNetworkMessagesSetting, this._filter._hideNetworkMessagesSetting.title(),
         Common.UIString('Hide network'));
     var monitoringXHREnabledSetting = Common.moduleSetting('monitoringXHREnabled');
@@ skipping 24 matching lines @@
     this._viewport.setStickToBottom(true);
     this._viewport.contentElement().classList.add('console-group', 'console-group-messages');
     this._contentsElement.appendChild(this._viewport.element);
     this._messagesElement = this._viewport.element;
     this._messagesElement.id = 'console-messages';
     this._messagesElement.classList.add('monospace');
     this._messagesElement.addEventListener('click', this._messagesClicked.bind(this), true);
 
     this._viewportThrottler = new Common.Throttler(50);
 
-    this._filterStatusMessageElement = createElementWithClass('div', 'console-message');
-    this._messagesElement.insertBefore(this._filterStatusMessageElement, this._messagesElement.firstChild);
-    this._filterStatusTextElement = this._filterStatusMessageElement.createChild('span', 'console-info');
-    this._filterStatusMessageElement.createTextChild(' ');
-
     this._topGroup = Console.ConsoleGroup.createTopGroup();
     this._currentGroup = this._topGroup;
 
     this._promptElement = this._messagesElement.createChild('div', 'source-code');
     var promptIcon = UI.Icon.create('smallicon-text-prompt', 'console-prompt-icon');
     this._promptElement.appendChild(promptIcon);
     this._promptElement.id = 'console-prompt';
     this._promptElement.addEventListener('input', this._promptInput.bind(this), false);
 
     // FIXME: This is a workaround for the selection machinery bug. See crbug.com/410899
@@ skipping 289 matching lines @@
     // This functions is sniffed in tests.
   }
 
   _immediatelyScrollToBottom() {
     // This will scroll viewport and trigger its refresh.
     this._viewport.setStickToBottom(true);
     this._promptElement.scrollIntoView(true);
   }
 
   _updateFilterStatus() {
-    this._filterStatusTextElement.removeChildren();
-    this._filterStatusTextElement.createTextChild(Common.UIString(
-        this._hiddenByFilterCount === 1 ? '1 message is hidden by filters.' :
-                                          this._hiddenByFilterCount + ' messages are hidden by filters.'));
-    this._filterStatusMessageElement.style.display = this._hiddenByFilterCount ? '' : 'none';
+    this._filterStatusText.setText(Common.UIString(
+        this._hiddenByFilterCount === 1 ? '1 item hidden by filters' :
+                                          this._hiddenByFilterCount + ' items hidden by filters'));
+    this._filterStatusText.setVisible(!!this._hiddenByFilterCount);
   }
 
   /**
    * @param {!Common.Event} event
    */
   _onConsoleMessageAdded(event) {
     var message = /** @type {!SDK.ConsoleMessage} */ (event.data);
     this._addConsoleMessage(message);
   }
 
@@ skipping 873 matching lines @@
         return true;
     }
     return false;
   }
 };
 
 /**
  * @typedef {{messageIndex: number, matchIndex: number}}
  */
 Console.ConsoleView.RegexMatchRange;