DevTools: only allow status bar items in status bars.

Source/devtools/front_end/profiler/ProfilesPanel.js

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 62 matching lines @@
     },
 
     /**
      * @return {?string}
      */
     fileExtension: function()
     {
         return null;
     },
 
-    get statusBarItems()
+    /**
+     * @return {!Array.<!WebInspector.StatusBarItem>}
+     */
+    statusBarItems: function()
     {
         return [];
     },
 
     get buttonTooltip()
     {
         return "";
     },
 
     get id()
@@ skipping 352 matching lines @@
 
     this.profilesItemTreeElement = new WebInspector.ProfilesSidebarTreeElement(this);
     this.sidebarTree.setFocusable(false);
     this.sidebarTree.appendChild(this.profilesItemTreeElement);
 
     this.profileViews = createElement("div");
     this.profileViews.id = "profile-views";
     this.profileViews.classList.add("vbox");
     mainView.element.appendChild(this.profileViews);
 
-    var statusBarContainer = createElementWithClass("div", "profiles-status-bar");
-    mainView.element.insertBefore(statusBarContainer, mainView.element.firstChild);
-    this._statusBarElement = statusBarContainer.createChild("div", "status-bar");
+    this._statusBarElement = createElementWithClass("div", "profiles-status-bar");
+    mainView.element.insertBefore(this._statusBarElement, mainView.element.firstChild);
 
     this.sidebarElement().classList.add("profiles-sidebar-tree-box");
     var statusBarContainerLeft = createElementWithClass("div", "profiles-status-bar");
     this.sidebarElement().insertBefore(statusBarContainerLeft, this.sidebarElement().firstChild);
-    this._statusBarButtons = statusBarContainerLeft.createChild("div", "status-bar");
+    var statusBar = new WebInspector.StatusBar(statusBarContainerLeft);
 
     this.recordButton = new WebInspector.StatusBarButton("", "record-profile-status-bar-item");
     this.recordButton.addEventListener("click", this.toggleRecordButton, this);
-    this._statusBarButtons.appendChild(this.recordButton.element);
+    statusBar.appendStatusBarItem(this.recordButton);
 
     this.clearResultsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Clear all profiles."), "clear-status-bar-item");
     this.clearResultsButton.addEventListener("click", this._reset, this);
-    this._statusBarButtons.appendChild(this.clearResultsButton.element);
+    statusBar.appendStatusBarItem(this.clearResultsButton);
 
-    this._profileTypeStatusBarItemsContainer = this._statusBarElement.createChild("div");
-    this._profileViewStatusBarItemsContainer = this._statusBarElement.createChild("div");
+    this._profileTypeStatusBar = new WebInspector.StatusBar(this._statusBarElement);
+    this._profileViewStatusBar = new WebInspector.StatusBar(this._statusBarElement);
 
     this._profileGroups = {};
     this._launcherView = new WebInspector.MultiProfileLauncherView(this);
     this._launcherView.addEventListener(WebInspector.MultiProfileLauncherView.EventTypes.ProfileTypeSelected, this._onProfileTypeSelected, this);
 
     this._profileToView = [];
     this._typeIdToSidebarSection = {};
     var types = WebInspector.ProfileTypeRegistry.instance.profileTypes();
     for (var i = 0; i < types.length; i++)
         this._registerProfileType(types[i]);
@@ skipping 125 matching lines @@
      */
     _onProfileTypeSelected: function(event)
     {
         this._selectedProfileType = /** @type {!WebInspector.ProfileType} */ (event.data);
         this._updateProfileTypeSpecificUI();
     },
 
     _updateProfileTypeSpecificUI: function()
     {
         this._updateRecordButton(this.recordButton.toggled());
-        this._profileTypeStatusBarItemsContainer.removeChildren();
-        var statusBarItems = this._selectedProfileType.statusBarItems;
-        if (statusBarItems) {
-            for (var i = 0; i < statusBarItems.length; ++i)
-                this._profileTypeStatusBarItemsContainer.appendChild(statusBarItems[i]);
-        }
+        this._profileTypeStatusBar.removeStatusBarItems();

[apavlov, 2014/11/14 09:36:08]

clear() ?

[pfeldman, 2014/11/14 09:37:19]

Acknowledged.

+        var statusBarItems = this._selectedProfileType.statusBarItems();
+        for (var i = 0; i < statusBarItems.length; ++i)
+            this._profileTypeStatusBar.appendStatusBarItem(statusBarItems[i]);
     },
 
     _reset: function()
     {
         WebInspector.Panel.prototype.reset.call(this);
 
         var types = WebInspector.ProfileTypeRegistry.instance.profileTypes();
         for (var i = 0; i < types.length; i++)
             types[i]._reset();
 
         delete this.visibleView;
 
         this._profileGroups = {};
         this._updateRecordButton(false);
         this._launcherView.profileFinished();
 
         this.sidebarTree.element.classList.remove("some-expandable");
 
         this._launcherView.detach();
         this.profileViews.removeChildren();
-        this._profileViewStatusBarItemsContainer.removeChildren();
+        this._profileViewStatusBar.removeStatusBarItems();
 
         this.removeAllListeners();
 
         this.recordButton.setVisible(true);
-        this._profileViewStatusBarItemsContainer.classList.remove("hidden");
+        this._profileViewStatusBar.element.classList.remove("hidden");
         this.clearResultsButton.element.classList.remove("hidden");
         this.profilesItemTreeElement.select();
         this._showLauncherView();
     },
 
     _showLauncherView: function()
     {
         this.closeVisibleView();
-        this._profileViewStatusBarItemsContainer.removeChildren();
+        this._profileViewStatusBar.removeStatusBarItems();
         this._launcherView.show(this.profileViews);
         this.visibleView = this._launcherView;
     },
 
     /**
      * @param {!WebInspector.ProfileType} profileType
      */
     _registerProfileType: function(profileType)
     {
         this._launcherView.addProfileType(profileType);
@@ skipping 122 matching lines @@
 
         view.show(this.profileViews);
         view.focus();
 
         this.visibleView = view;
 
         var profileTypeSection = this._typeIdToSidebarSection[profile.profileType().id];
         var sidebarElement = profileTypeSection.sidebarElementForProfile(profile);
         sidebarElement.revealAndSelect();
 
-        this._profileViewStatusBarItemsContainer.removeChildren();
+        this._profileViewStatusBar.removeStatusBarItems();
 
-        var statusBarItems = view.statusBarItems;
-        if (statusBarItems)
-            for (var i = 0; i < statusBarItems.length; ++i)
-                this._profileViewStatusBarItemsContainer.appendChild(statusBarItems[i]);
+        var statusBarItems = view.statusBarItems();
+        for (var i = 0; i < statusBarItems.length; ++i)
+            this._profileViewStatusBar.appendStatusBarItem(statusBarItems[i]);
 
         return view;
     },
 
     /**
      * @param {!HeapProfilerAgent.HeapSnapshotObjectId} snapshotObjectId
      * @param {string} perspectiveName
      */
     showObject: function(snapshotObjectId, perspectiveName)
     {
@@ skipping 434 matching lines @@
 
 WebInspector.ProfilesPanelFactory.prototype = {
     /**
      * @return {!WebInspector.Panel}
      */
     createPanel: function()
     {
         return WebInspector.ProfilesPanel._instance();
     }
 }