Commit 72a06fc0 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

DevTools: do not suggest mapping workspace to itself, remove workspace mapping...

DevTools: do not suggest mapping workspace to itself, remove workspace mapping tip from behind experiments.

Review URL: https://codereview.chromium.org/664713002

git-svn-id: svn://svn.chromium.org/blink/trunk@183973 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3dfbd2ef
...@@ -155,7 +155,6 @@ WebInspector.Main.prototype = { ...@@ -155,7 +155,6 @@ WebInspector.Main.prototype = {
Runtime.experiments.register("gpuTimeline", "GPU data on timeline", true); Runtime.experiments.register("gpuTimeline", "GPU data on timeline", true);
Runtime.experiments.register("layersPanel", "Layers panel"); Runtime.experiments.register("layersPanel", "Layers panel");
Runtime.experiments.register("promiseTracker", "Enable Promise inspection", true); Runtime.experiments.register("promiseTracker", "Enable Promise inspection", true);
Runtime.experiments.register("suggestUsingWorkspace", "Suggest using workspace", true);
Runtime.experiments.register("timelineOnTraceEvents", "Timeline on trace events"); Runtime.experiments.register("timelineOnTraceEvents", "Timeline on trace events");
Runtime.experiments.register("timelinePowerProfiler", "Timeline power profiler"); Runtime.experiments.register("timelinePowerProfiler", "Timeline power profiler");
Runtime.experiments.register("timelineJSCPUProfile", "Timeline with JS sampling"); Runtime.experiments.register("timelineJSCPUProfile", "Timeline with JS sampling");
......
...@@ -26,11 +26,9 @@ WebInspector.WorkspaceMappingTip.prototype = { ...@@ -26,11 +26,9 @@ WebInspector.WorkspaceMappingTip.prototype = {
_editorSelected: function(event) _editorSelected: function(event)
{ {
var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data); var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
if (Runtime.experiments.isEnabled("suggestUsingWorkspace")) {
if (this._editorSelectedTimer) if (this._editorSelectedTimer)
clearTimeout(this._editorSelectedTimer); clearTimeout(this._editorSelectedTimer);
this._editorSelectedTimer = setTimeout(this._updateSuggestedMappingInfobar.bind(this, uiSourceCode), 3000); this._editorSelectedTimer = setTimeout(this._updateSuggestedMappingInfobar.bind(this, uiSourceCode), 3000);
}
}, },
/** /**
...@@ -52,7 +50,7 @@ WebInspector.WorkspaceMappingTip.prototype = { ...@@ -52,7 +50,7 @@ WebInspector.WorkspaceMappingTip.prototype = {
return; 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)); networkProjects = networkProjects.concat(this._workspace.projectsForType(WebInspector.projectTypes.ContentScripts));
for (var i = 0; i < networkProjects.length; ++i) { for (var i = 0; i < networkProjects.length; ++i) {
var name = uiSourceCode.name(); var name = uiSourceCode.name();
......
...@@ -134,6 +134,7 @@ button.status-bar-item.scripts-navigator-show-hide-button { ...@@ -134,6 +134,7 @@ button.status-bar-item.scripts-navigator-show-hide-button {
margin-right: 4px; margin-right: 4px;
display: inline-block; display: inline-block;
margin-top: 1px; margin-top: 1px;
flex: none;
} }
.source-frame-infobar-info .source-frame-infobar-icon { .source-frame-infobar-info .source-frame-infobar-icon {
...@@ -150,7 +151,7 @@ button.status-bar-item.scripts-navigator-show-hide-button { ...@@ -150,7 +151,7 @@ button.status-bar-item.scripts-navigator-show-hide-button {
.source-frame-infobar-main-row { .source-frame-infobar-main-row {
display: flex; display: flex;
flex: 0 0 17px; min-height: 17px;
overflow: hidden; overflow: hidden;
margin: 5px 10px 0px; margin: 5px 10px 0px;
} }
...@@ -169,10 +170,15 @@ button.status-bar-item.scripts-navigator-show-hide-button { ...@@ -169,10 +170,15 @@ button.status-bar-item.scripts-navigator-show-hide-button {
.source-frame-infobar-row-message { .source-frame-infobar-row-message {
flex: 0 1 auto; flex: 0 1 auto;
margin-bottom: 4px;
}
.source-frame-infobar-main-row .close-button {
flex: none;
} }
.source-frame-infobar-toggle { .source-frame-infobar-toggle {
flex: auto; flex: 1 0 auto;
padding: 0 4px; padding: 0 4px;
-webkit-user-select: none; -webkit-user-select: none;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment