DevTools: do not suggest mapping workspace to itself, remove workspace mapping tip from behind expe…

Source/devtools/front_end/sources/WorkspaceMappingTip.js

 
 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @param {!WebInspector.SourcesPanel} sourcesPanel
  * @param {!WebInspector.Workspace} workspace
  */
 WebInspector.WorkspaceMappingTip = function(sourcesPanel, workspace)
 {
     this._sourcesPanel = sourcesPanel;
     this._workspace = workspace;
 
     this._sourcesView = this._sourcesPanel.sourcesView();
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorSelected, this._editorSelected.bind(this));
 }
 
 WebInspector.WorkspaceMappingTip._infobarSymbol = Symbol("infobar");
 
 WebInspector.WorkspaceMappingTip.prototype = {
     /**
      * @param {!WebInspector.Event} event
      */
     _editorSelected: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
-        if (Runtime.experiments.isEnabled("suggestUsingWorkspace")) {
-            if (this._editorSelectedTimer)
-                clearTimeout(this._editorSelectedTimer);
-            this._editorSelectedTimer = setTimeout(this._updateSuggestedMappingInfobar.bind(this, uiSourceCode), 3000);
-        }
+        if (this._editorSelectedTimer)
+            clearTimeout(this._editorSelectedTimer);
+        this._editorSelectedTimer = setTimeout(this._updateSuggestedMappingInfobar.bind(this, uiSourceCode), 3000);
     },
 
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      */
     _updateSuggestedMappingInfobar: function(uiSourceCode)
     {
         var uiSourceCodeFrame = this._sourcesView.viewForFile(uiSourceCode);
 
         if (!uiSourceCodeFrame.isShowing())
             return;
         if (uiSourceCode[WebInspector.WorkspaceMappingTip._infobarSymbol])
             return;
 
         // First try mapping filesystem -> network.
         if (uiSourceCode.project().type() === WebInspector.projectTypes.FileSystem) {
             var hasMappings = !!uiSourceCode.url;
             if (hasMappings)
                 return;
         }
 
-        var networkProjects = this._workspace.projectsForType(WebInspector.projectTypes.FileSystem);
+        var networkProjects = this._workspace.projectsForType(WebInspector.projectTypes.Network);
         networkProjects = networkProjects.concat(this._workspace.projectsForType(WebInspector.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._createMappingInfobar(uiSourceCode, false);
                     return;
                 }
             }
@@ skipping 81 matching lines @@
         var rowElement = infobar.createDetailsRowMessage(WebInspector.UIString("For more information on workspaces, refer to the "));
         var a = rowElement.createChild("a");
         a.textContent = "workspaces documentation";
         a.href = "https://developer.chrome.com/devtools/docs/workspaces";
         rowElement.createTextChild(".");
         uiSourceCode[WebInspector.WorkspaceMappingTip._infobarSymbol] = infobar;
         uiSourceCodeFrame.attachInfobars([infobar]);
         WebInspector.runCSSAnimationOnce(infobar.element, "source-frame-infobar-animation");
     }
 }