| Index: third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js b/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js
|
| index 83aedaf01493e018117006ad674e00219e13a06d..4088f92f8756bf0f890724494cad42f29d3c0bb3 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/sources/WorkspaceMappingTip.js
|
| @@ -58,40 +58,30 @@ Sources.WorkspaceMappingTip = class {
|
|
|
| // First try mapping filesystem -> network.
|
| if (!this._workspaceMappingInfobarDisabledSetting.get() &&
|
| - uiSourceCode.project().type() === Workspace.projectTypes.FileSystem) {
|
| + Persistence.FileSystemWorkspaceBinding.isFileSystemUISourceCode(uiSourceCode)) {
|
| if (Persistence.persistence.binding(uiSourceCode))
|
| return;
|
|
|
| - var networkProjects = this._workspace.projectsForType(Workspace.projectTypes.Network);
|
| - networkProjects = networkProjects.concat(this._workspace.projectsForType(Workspace.projectTypes.ContentScripts));
|
| - for (var i = 0; i < networkProjects.length; ++i) {
|
| - var name = uiSourceCode.name();
|
| - var networkUiSourceCodes = networkProjects[i].uiSourceCodes();
|
| - for (var j = 0; j < networkUiSourceCodes.length; ++j) {
|
| - if (networkUiSourceCodes[j].name() === name && this._isLocalHost(networkUiSourceCodes[j].url())) {
|
| - this._showMappingInfobar(uiSourceCode, false);
|
| - return;
|
| - }
|
| + var name = uiSourceCode.name();
|
| + for (var networkUiSourceCode of Bindings.NetworkProject.uiSourceCodes(this._workspace)) {
|
| + if (networkUiSourceCode.name() === name && this._isLocalHost(networkUiSourceCode.url())) {
|
| + this._showMappingInfobar(uiSourceCode, false);
|
| + return;
|
| }
|
| }
|
| }
|
|
|
| // Then map network -> filesystem.
|
| - if (uiSourceCode.project().type() === Workspace.projectTypes.Network ||
|
| - uiSourceCode.project().type() === Workspace.projectTypes.ContentScripts) {
|
| + if (Bindings.NetworkProject.isNetworkUISourceCode(uiSourceCode)) {
|
| // Suggest for localhost only.
|
| if (!this._isLocalHost(uiSourceCode.url()) || Persistence.persistence.binding(uiSourceCode))
|
| return;
|
|
|
| - var filesystemProjects = this._workspace.projectsForType(Workspace.projectTypes.FileSystem);
|
| - for (var i = 0; i < filesystemProjects.length; ++i) {
|
| - var name = uiSourceCode.name();
|
| - var fsUiSourceCodes = filesystemProjects[i].uiSourceCodes();
|
| - for (var j = 0; j < fsUiSourceCodes.length; ++j) {
|
| - if (fsUiSourceCodes[j].name() === name) {
|
| - this._showMappingInfobar(uiSourceCode, true);
|
| - return;
|
| - }
|
| + var name = uiSourceCode.name();
|
| + for (var fsUiSourceCode of Persistence.FileSystemWorkspaceBinding.uiSourceCodes(this._workspace)) {
|
| + if (fsUiSourceCode.name() === name) {
|
| + this._showMappingInfobar(uiSourceCode, true);
|
| + return;
|
| }
|
| }
|
|
|
| @@ -154,7 +144,7 @@ Sources.WorkspaceMappingTip = class {
|
| */
|
| _establishTheMapping(uiSourceCode, event) {
|
| event.consume(true);
|
| - if (uiSourceCode.project().type() === Workspace.projectTypes.FileSystem)
|
| + if (Persistence.FileSystemWorkspaceBinding.isFileSystemUISourceCode(uiSourceCode))
|
| this._sourcesPanel.mapFileSystemToNetwork(uiSourceCode);
|
| else
|
| this._sourcesPanel.mapNetworkToFileSystem(uiSourceCode);
|
|
|