[DevTools] Expose left and right toolbar in TabbedPane.

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

Index: third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
diff --git a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
index 584a011a526f0ed11a0479a81ee6aa231761b196..9c791d09eb3b1c6806ce3c2b5c194c3ddef57942 100644
--- a/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
+++ b/third_party/WebKit/Source/devtools/front_end/ui/Toolbar.js
@@ -946,66 +946,50 @@ WebInspector.ToolbarCheckbox.prototype = {
 }
 
 /**
- * @constructor
- * @extends {WebInspector.Toolbar}
+ * @param {!WebInspector.Toolbar} toolbar
  * @param {string} location
- * @param {!Element=} parentElement
  */
-WebInspector.ExtensibleToolbar = function(location, parentElement)
+WebInspector.Toolbar.appendLocationItems = function(toolbar, location)
 {
-    WebInspector.Toolbar.call(this, "", parentElement);
-    this._loadItems(location);
-}
+    var extensions = self.runtime.extensions(WebInspector.ToolbarItem.Provider);
+    var promises = [];
+    for (var i = 0; i < extensions.length; ++i) {
+        if (extensions[i].descriptor()["location"] === location)
+            promises.push(resolveItem(extensions[i]));
+    }
+    Promise.all(promises).then(appendItemsInOrder);
 
-WebInspector.ExtensibleToolbar.prototype = {
     /**
-     * @param {string} location
+     * @param {!Runtime.Extension} extension
+     * @return {!Promise.<?WebInspector.ToolbarItem>}
      */
-    _loadItems: function(location)
+    function resolveItem(extension)
     {
-        var extensions = self.runtime.extensions(WebInspector.ToolbarItem.Provider);
-        var promises = [];
-        for (var i = 0; i < extensions.length; ++i) {
-            if (extensions[i].descriptor()["location"] === location)
-                promises.push(resolveItem(extensions[i]));
-        }
-        Promise.all(promises).then(appendItemsInOrder.bind(this));
+        var descriptor = extension.descriptor();
+        if (descriptor["separator"])
+            return Promise.resolve(/** @type {?WebInspector.ToolbarItem} */(new WebInspector.ToolbarSeparator()));
+        if (descriptor["actionId"])
+            return Promise.resolve(WebInspector.Toolbar.createActionButtonForId(descriptor["actionId"]));
+        return extension.instance().then(fetchItemFromProvider);
 
         /**
-         * @param {!Runtime.Extension} extension
-         * @return {!Promise.<?WebInspector.ToolbarItem>}
+         * @param {!Object} provider
          */
-        function resolveItem(extension)
+        function fetchItemFromProvider(provider)
         {
-            var descriptor = extension.descriptor();
-            if (descriptor["separator"])
-                return Promise.resolve(/** @type {?WebInspector.ToolbarItem} */(new WebInspector.ToolbarSeparator()));
-            if (descriptor["actionId"])
-                return Promise.resolve(WebInspector.Toolbar.createActionButtonForId(descriptor["actionId"]));
-            return extension.instance().then(fetchItemFromProvider);
-
-            /**
-             * @param {!Object} provider
-             */
-            function fetchItemFromProvider(provider)
-            {
-                return /** @type {!WebInspector.ToolbarItem.Provider} */ (provider).item();
-            }
+            return /** @type {!WebInspector.ToolbarItem.Provider} */ (provider).item();
         }
+    }
 
-        /**
-         * @param {!Array.<?WebInspector.ToolbarItem>} items
-         * @this {WebInspector.ExtensibleToolbar}
-         */
-        function appendItemsInOrder(items)
-        {
-            for (var i = 0; i < items.length; ++i) {
-                var item = items[i];
-                if (item)
-                    this.appendToolbarItem(item);
-            }
+    /**
+     * @param {!Array.<?WebInspector.ToolbarItem>} items
+     */
+    function appendItemsInOrder(items)
+    {
+        for (var i = 0; i < items.length; ++i) {
+            var item = items[i];
+            if (item)
+                toolbar.appendToolbarItem(item);
         }
-    },
-
-    __proto__: WebInspector.Toolbar.prototype
+    }
 }