Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1269)

Unified Diff: Source/devtools/front_end/main/Main.js

Issue 338283004: DevTools: Use TargetsToolbar instead of ThreadToolbar (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/devtools/front_end/main/Main.js
diff --git a/Source/devtools/front_end/main/Main.js b/Source/devtools/front_end/main/Main.js
index b423b6469ab366befe86c9b472970121a935194d..897200fdd9466cab7c50f2e5df8b893e4eabd7d5 100644
--- a/Source/devtools/front_end/main/Main.js
+++ b/Source/devtools/front_end/main/Main.js
@@ -266,7 +266,7 @@ WebInspector.Main.prototype = {
WebInspector.setToolbarColors(WebInspector.queryParam("toolbarColor"), WebInspector.queryParam("textColor"));
WebInspector.targetManager = new WebInspector.TargetManager();
- WebInspector.targetManager.createTarget(connection, this._doLoadedDoneWithCapabilities.bind(this));
+ WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), connection, this._doLoadedDoneWithCapabilities.bind(this));
WebInspector.isolatedFileSystemManager = new WebInspector.IsolatedFileSystemManager();
WebInspector.isolatedFileSystemDispatcher = new WebInspector.IsolatedFileSystemDispatcher(WebInspector.isolatedFileSystemManager);
WebInspector.workspace = new WebInspector.Workspace(WebInspector.isolatedFileSystemManager.mapping());
@@ -276,7 +276,7 @@ WebInspector.Main.prototype = {
WebInspector.fileSystemWorkspaceBinding = new WebInspector.FileSystemWorkspaceBinding(WebInspector.isolatedFileSystemManager, WebInspector.workspace);
WebInspector.breakpointManager = new WebInspector.BreakpointManager(WebInspector.settings.breakpoints, WebInspector.workspace, WebInspector.targetManager);
WebInspector.scriptSnippetModel = new WebInspector.ScriptSnippetModel(WebInspector.workspace);
- this._executionContextSelector = new WebInspector.ExecutionContextSelector();
+ WebInspector.executionContextSelector = new WebInspector.ExecutionContextSelector();
},
_doLoadedDoneWithCapabilities: function(mainTarget)
@@ -806,7 +806,7 @@ WebInspector.Main._addWebSocketTarget = function(ws)
*/
function callback(connection)
{
- WebInspector.targetManager.createTarget(connection);
+ WebInspector.targetManager.createTarget(ws, connection);
}
new InspectorBackendClass.WebSocketConnection(ws, callback);
}

Powered by Google App Engine
This is Rietveld 408576698