Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/ui/TabbedPane.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/ui/TabbedPane.js b/third_party/WebKit/Source/devtools/front_end/ui/TabbedPane.js |
| index 9f3fb088f76a98154fdfa0670d73a033e37dde11..8ad8b585951379d7bfb5444fe335651286c19e7f 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/ui/TabbedPane.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/ui/TabbedPane.js |
| @@ -1273,11 +1273,7 @@ WebInspector.ExtensibleTabbedPaneController.prototype = { |
| this._extensions.set(id, extensions[i]); |
| if (this._isPermanentTab(id)) |
| this._appendTab(extensions[i]); |
| - } |
| - |
| - for (var i = 0; i < extensions.length; i++) { |
|
dgozman
2016/07/09 01:12:15
This code made it so all permanent tabs are always
pfeldman
2016/07/09 01:37:03
We are controlling this using extension order.
|
| - var id = extensions[i].descriptor()["name"]; |
| - if (this._isCloseableTab(id) && this._closeableTabSetting.get()[id]) |
| + else if (this._isCloseableTab(id) && this._closeableTabSetting.get()[id]) |
| this._appendTab(extensions[i]); |
| } |
| }, |
| @@ -1313,13 +1309,10 @@ WebInspector.ExtensibleTabbedPaneController.prototype = { |
| */ |
| _appendTabsToMenu: function(contextMenu) |
| { |
| - for (var id of this._extensions.keysArray().filter(this._isPermanentTab.bind(this))) { |
| - var title = WebInspector.UIString(this._extensions.get(id).title(WebInspector.platform())); |
| - contextMenu.appendItem(title, this.showTab.bind(this, id)); |
| - } |
| - for (var id of this._extensions.keysArray().filter(this._isCloseableTab.bind(this))) { |
| - var title = WebInspector.UIString(this._extensions.get(id).title(WebInspector.platform())); |
| - contextMenu.appendItem(title, this.showTab.bind(this, id)); |
| + var extensions = self.runtime.extensions(this._extensionPoint, undefined, true); |
| + for (var extension of extensions) { |
| + var title = WebInspector.UIString(extension.title(WebInspector.platform())); |
| + contextMenu.appendItem(title, this.showTab.bind(this, extension.descriptor()["name"])); |
| } |
| }, |