Revert 178911 "Revert 178848 "[DevTools] Make toolbar counters d..."

trunk/Source/devtools/front_end/main/module.json

Index: trunk/Source/devtools/front_end/main/module.json
===================================================================
--- trunk/Source/devtools/front_end/main/module.json	(revision 178929)
+++ trunk/Source/devtools/front_end/main/module.json	(working copy)
@@ -150,31 +150,49 @@
             "className": "WebInspector.OverridesView.Revealer"
         },
         {
-            "type": "@WebInspector.StatusBarButton.Provider",
+            "type": "@WebInspector.StatusBarItem.Provider",
             "className": "WebInspector.InspectElementModeController.ToggleButtonProvider",
             "location": "toolbar-left",
             "order": 0,
             "actionId": "main.toggle-element-search"
         },
         {
-            "type": "@WebInspector.StatusBarButton.Provider",
+            "type": "@WebInspector.StatusBarItem.Provider",
             "className": "WebInspector.AdvancedApp.EmulationButtonProvider",
             "order": 1,
             "location": "toolbar-left"
         },
         {
-            "type": "@WebInspector.StatusBarButton.Provider",
-            "className": "WebInspector.DockController.ButtonProvider",
+            "type": "@WebInspector.StatusBarItem.Provider",
+            "className": "WebInspector.AdvancedApp.DeviceCounter",
+            "order": 0,
+            "location": "toolbar-right"
+        },
+        {
+            "type": "@WebInspector.StatusBarItem.Provider",
+            "className": "WebInspector.Main.WarningErrorCounter",
             "order": 1,
             "location": "toolbar-right"
         },
         {
-            "type": "@WebInspector.StatusBarButton.Provider",
-            "className": "WebInspector.ScreencastApp.StatusBarButtonProvider",
+            "type": "@WebInspector.StatusBarItem.Provider",
+            "className": "WebInspector.InspectorView.ToggleDrawerButtonProvider",
             "order": 2,
             "location": "toolbar-right"
         },
         {
+            "type": "@WebInspector.StatusBarItem.Provider",
+            "className": "WebInspector.DockController.ButtonProvider",
+            "order": 4,
+            "location": "toolbar-right"
+        },
+        {
+            "type": "@WebInspector.StatusBarItem.Provider",
+            "className": "WebInspector.ScreencastApp.StatusBarButtonProvider",
+            "order": 5,
+            "location": "toolbar-right"
+        },
+        {
             "type": "ui-setting",
             "title": "Disable cache (while DevTools is open)",
             "settingName": "cacheDisabled",