[DevTools] Make toolbar counters declarative.

Source/devtools/front_end/main/Main.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * 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
@@ skipping 32 matching lines @@
     {
         this._loaded();
         window.removeEventListener("DOMContentLoaded", boundListener, false);
     }
     window.addEventListener("DOMContentLoaded", boundListener, false);
 }
 
 WebInspector.Main.prototype = {
     _createGlobalStatusBarItems: function()
     {
-        var extensions = WebInspector.moduleManager.extensions(WebInspector.StatusBarButton.Provider);
+        var extensions = WebInspector.moduleManager.extensions(WebInspector.StatusBarItem.Provider);
 
         /**
          * @param {!WebInspector.ModuleManager.Extension} left
          * @param {!WebInspector.ModuleManager.Extension} right
          */
         function orderComparator(left, right)
         {
             return left.descriptor()["order"] - right.descriptor()["order"];
         }
         extensions.sort(orderComparator);
         extensions.forEach(function(extension) {
-            var button;
+            var item;
             switch (extension.descriptor()["location"]) {
             case "toolbar-left":
-                button = createButton(extension);
-                if (button)
-                    WebInspector.inspectorView.appendToLeftToolbar(button);
+                item = createItem(extension);
+                if (item)
+                    WebInspector.inspectorView.appendToLeftToolbar(item);
                 break;
             case "toolbar-right":
-                button = createButton(extension);
-                if (button)
-                    WebInspector.inspectorView.appendToRightToolbar(button);
+                item = createItem(extension);
+                if (item)
+                    WebInspector.inspectorView.appendToRightToolbar(item);
                 break;
             }
-            if (button && extension.descriptor()["actionId"]) {
-                button.addEventListener("click", function() {
+            if (item && extension.descriptor()["actionId"]) {
+                item.addEventListener("click", function() {
                     WebInspector.actionRegistry.execute(extension.descriptor()["actionId"]);
                 });
             }
         });
 
-        function createButton(extension)
+        function createItem(extension)
         {
             var descriptor = extension.descriptor();
             if (descriptor.className)
-                return extension.instance().button();
+                return extension.instance().item();
             return new WebInspector.StatusBarButton(WebInspector.UIString(descriptor["title"]), descriptor["elementClass"]);
         }
     },
 
     _calculateWorkerInspectorTitle: function()
     {
         var expression = "location.href";
         if (WebInspector.queryParam("isSharedWorker"))
             expression += " + (this.name ? ' (' + this.name + ')' : '')";
         RuntimeAgent.invoke_evaluate({expression:expression, doNotPauseOnExceptionsAndMuteConsole:true, returnByValue: true}, evalCallback);
@@ skipping 253 matching lines @@
         WebInspector.domBreakpointsSidebarPane = new WebInspector.DOMBreakpointsSidebarPane();
         var autoselectPanel = WebInspector.UIString("a panel chosen automatically");
         var openAnchorLocationSetting = WebInspector.settings.createSetting("openLinkHandler", autoselectPanel);
         WebInspector.openAnchorLocationRegistry = new WebInspector.HandlerRegistry(openAnchorLocationSetting);
         WebInspector.openAnchorLocationRegistry.registerHandler(autoselectPanel, function() { return false; });
         WebInspector.Linkifier.setLinkHandler(new WebInspector.HandlerRegistry.LinkHandler());
         new WebInspector.WorkspaceController(WebInspector.workspace);
         new WebInspector.CSSStyleSheetMapping(WebInspector.cssModel, WebInspector.workspace, WebInspector.networkWorkspaceBinding);
         new WebInspector.RenderingOptions();
         new WebInspector.Main.PauseListener();
-        new WebInspector.Main.WarningErrorCounter();
         new WebInspector.Main.InspectedNodeRevealer();
 
         this._addMainEventListeners(document);
 
-        var errorWarningCount = document.getElementById("error-warning-count");
-        function showConsole()
-        {
-            WebInspector.console.show();
-        }
-        errorWarningCount.addEventListener("click", showConsole, false);
-
         WebInspector.extensionServerProxy.setFrontendReady();
 
         InspectorAgent.enable(inspectorAgentEnableCallback);
 
         function inspectorAgentEnableCallback()
         {
             console.timeStamp("Main.inspectorAgentEnableCallback");
             WebInspector.app.presentUI(mainTarget);
             console.timeStamp("Main.inspectorAgentEnableCallbackPresentUI");
         }
@@ skipping 439 matching lines @@
  * @param {string} name
  * @return {?WebInspector.Panel}
  */
 WebInspector.panel = function(name)
 {
     return WebInspector.inspectorView.panel(name);
 }
 
 /**
  * @constructor
+ * @implements {WebInspector.StatusBarItem.Provider}
  */
 WebInspector.Main.WarningErrorCounter = function()
 {
+    this._counter = new WebInspector.StatusBarCounter(["error-icon-small", "warning-icon-small"]);
+    this._counter.addEventListener("click", showConsole);
+
+    function showConsole()
+    {
+        WebInspector.console.show();
+    }
+
     WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.ConsoleCleared, this._updateErrorAndWarningCounts, this);
     WebInspector.multitargetConsoleModel.addEventListener(WebInspector.ConsoleModel.Events.MessageAdded, this._updateErrorAndWarningCounts, this);
 }
 
 WebInspector.Main.WarningErrorCounter.prototype = {
     _updateErrorAndWarningCounts: function()
     {
         var errors = 0;
         var warnings = 0;
         var targets = WebInspector.targetManager.targets();
         for (var i = 0; i < targets.length; ++i) {
             errors = errors + targets[i].consoleModel.errors;
             warnings = warnings + targets[i].consoleModel.warnings;
         }
-        WebInspector.inspectorView.setErrorAndWarningCounts(errors, warnings);
+        this._counter.setCounter("error-icon-small", errors, WebInspector.UIString("%d error%s", errors, errors > 1 ? "s" : ""));

[apavlov, 2014/07/21 13:34:06]

I believe this should be String.sprintf() rather than WebInspector.UIString(),
since it does not leave any possibility to i18n-ize the strings. Or, at least,
use string formatting similar to that for the device counter.

[dgozman, 2014/07/21 14:24:34]

Did the same as device counter.

+        this._counter.setCounter("warning-icon-small", warnings, WebInspector.UIString("%d warning%s", warnings, warnings > 1 ? "s" : ""));

[apavlov, 2014/07/21 13:34:06]

ditto

[dgozman, 2014/07/21 14:24:34]

Done.

+        WebInspector.inspectorView.toolbarItemResized();
+    },
+
+    /**
+     * @return {?WebInspector.StatusBarItem}
+     */
+    item: function()
+    {
+        return this._counter;
     }
 }
 
 /**
  * @constructor
  */
 WebInspector.Main.PauseListener = function()
 {
     WebInspector.targetManager.addModelListener(WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
 }
@@ skipping 21 matching lines @@
 
 WebInspector.Main.InspectedNodeRevealer.prototype = {
     /**
      * @param {!WebInspector.Event} event
      */
     _inspectNode: function(event)
     {
         WebInspector.Revealer.reveal(/** @type {!WebInspector.DOMNode} */ (event.data));
     }
 }