DevTools: refactoring connection creation, removing a couple of dead code branches.

Source/devtools/front_end/main/Main.js

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 173 matching lines @@
     _debuggerPaused: function()
     {
         WebInspector.debuggerModel.removeEventListener(WebInspector.DebuggerModel.Events.DebuggerPaused, this._debuggerPaused, this);
         WebInspector.inspectorView.showPanel("sources");
     },
 
     _loaded: function()
     {
         console.timeStamp("Main._loaded");
         WebInspector.moduleManager = new WebInspector.ModuleManager(allDescriptors);
+
+        // FIXME: Make toolbox a real app.
         if (WebInspector.queryParam("toolbox")) {
             new WebInspector.Toolbox();
             return;
         }
 
+        this._createSettings();
+        this._createConnection();
+    },
+
+    _createSettings: function()
+    {
         WebInspector.settings = new WebInspector.Settings();
         WebInspector.experimentsSettings = new WebInspector.ExperimentsSettings(WebInspector.queryParam("experiments") !== null);
         // This setting is needed for backwards compatibility with Devtools CodeSchool extension. DO NOT REMOVE
         WebInspector.settings.pauseOnExceptionStateString = new WebInspector.PauseOnExceptionStateSetting();
+        new WebInspector.VersionController().updateVersion();
+    },
 
-        if (!InspectorFrontendHost.sendMessageToEmbedder) {
-            var helpScreen = new WebInspector.HelpScreen(WebInspector.UIString("Incompatible Chrome version"));
-            var p = helpScreen.contentElement.createChild("p", "help-section");
-            p.textContent = WebInspector.UIString("Please upgrade to a newer Chrome version (you might need a Dev or Canary build).");
-            helpScreen.showModal();
+    _createConnection: function()
+    {
+        InspectorBackend.loadFromJSONIfNeeded("../protocol.json");
+
+        var workerId = WebInspector.queryParam("dedicatedWorkerId");
+        if (workerId) {
+            this._connectionEstablished(new WebInspector.ExternalWorkerConnection(workerId));
             return;
         }
 
-        InspectorBackend.loadFromJSONIfNeeded("../protocol.json");
-
-        var onConnectionReady = this._doLoadedDone.bind(this);
-
-        var workerId = WebInspector.queryParam("dedicatedWorkerId");
-        if (workerId) {
-            new WebInspector.ExternalWorkerConnection(workerId, onConnectionReady);
-            return;
-        }
-
-        var ws;
         if (WebInspector.queryParam("ws")) {
-            ws = "ws://" + WebInspector.queryParam("ws");
-        } else if (WebInspector.queryParam("page")) {
-            var page = WebInspector.queryParam("page");
-            var host = WebInspector.queryParam("host") || window.location.host;
-            ws = "ws://" + host + "/devtools/page/" + page;
-        }
-
-        if (ws) {
+            var ws = "ws://" + WebInspector.queryParam("ws");
             document.body.classList.add("remote");
-            new InspectorBackendClass.WebSocketConnection(ws, onConnectionReady);
+            InspectorBackendClass.WebSocketConnection.Create(ws, this._connectionEstablished.bind(this));
             return;
         }
 
         if (!InspectorFrontendHost.isStub()) {
-            new InspectorBackendClass.MainConnection(onConnectionReady);
+            this._connectionEstablished(new InspectorBackendClass.MainConnection());
             return;
         }
 
-        new InspectorBackendClass.StubConnection(onConnectionReady);
+        this._connectionEstablished(new InspectorBackendClass.StubConnection());
     },
 
     /**
      * @param {!InspectorBackendClass.Connection} connection
      */
-    _doLoadedDone: function(connection)
+    _connectionEstablished: function(connection)
     {
-        console.timeStamp("Main._doLoadedDone");
+        console.timeStamp("Main._connectionEstablished");
         connection.addEventListener(InspectorBackendClass.Connection.Events.Disconnected, onDisconnected);
 
         /**
          * @param {!WebInspector.Event} event
          */
         function onDisconnected(event)
         {
             if (WebInspector._disconnectedScreenWithReasonWasShown)
                 return;
             new WebInspector.RemoteDebuggingTerminatedScreen(event.data.reason).showModal();
         }
 
         InspectorBackend.setConnection(connection);
 
         // Install styles and themes
         WebInspector.installPortStyles();
 
         if (WebInspector.queryParam("toolbarColor") && WebInspector.queryParam("textColor"))
             WebInspector.setToolbarColors(WebInspector.queryParam("toolbarColor"), WebInspector.queryParam("textColor"));
         InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.SetToolbarColors, updateToolbarColors);
         /**
          * @param {!WebInspector.Event} event
          */
         function updateToolbarColors(event)
         {
             WebInspector.setToolbarColors(/** @type {string} */ (event.data["backgroundColor"]), /** @type {string} */ (event.data["color"]));
         }
         WebInspector.ContextMenu.initialize();
 
-        WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), connection, this._doLoadedDoneWithCapabilities.bind(this));
+        WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), connection, this._mainTargetCreated.bind(this));
         WebInspector.isolatedFileSystemManager = new WebInspector.IsolatedFileSystemManager();
         WebInspector.workspace = new WebInspector.Workspace(WebInspector.isolatedFileSystemManager.mapping());
         WebInspector.networkWorkspaceBinding = new WebInspector.NetworkWorkspaceBinding(WebInspector.workspace);
         new WebInspector.NetworkUISourceCodeProvider(WebInspector.networkWorkspaceBinding, WebInspector.workspace);
         new WebInspector.PresentationConsoleMessageHelper(WebInspector.workspace);
         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();
     },
 
-    _doLoadedDoneWithCapabilities: function(mainTarget)
+    /**
+     * @param {!WebInspector.Target} mainTarget
+     */
+    _mainTargetCreated: function(mainTarget)
     {
-        console.timeStamp("Main._doLoadedDoneWithCapabilities");
+        console.timeStamp("Main._mainTargetCreated");
         WebInspector.dockController = new WebInspector.DockController(!!WebInspector.queryParam("can_dock"));
         WebInspector.overridesSupport = new WebInspector.OverridesSupport(WebInspector.dockController.canDock());
 
         if (mainTarget.canScreencast)
             WebInspector.app = new WebInspector.ScreencastApp();
         else if (WebInspector.dockController.canDock())
             WebInspector.app = new WebInspector.AdvancedApp();
         else
             WebInspector.app = new WebInspector.SimpleApp();
 
         WebInspector.dockController.initialize();
 
-        new WebInspector.VersionController().updateVersion();
         WebInspector.shortcutsScreen = new WebInspector.ShortcutsScreen();
         this._registerShortcuts();
 
         // set order of some sections explicitly
         WebInspector.shortcutsScreen.section(WebInspector.UIString("Console"));
         WebInspector.shortcutsScreen.section(WebInspector.UIString("Elements Panel"));
 
         if (WebInspector.experimentsSettings.workersInMainWindow.isEnabled())
             WebInspector.workerTargetManager = new WebInspector.WorkerTargetManager(mainTarget, WebInspector.targetManager);
 
@@ skipping 514 matching lines @@
 });
 
 /**
  * @param {string} name
  * @return {?WebInspector.Panel}
  */
 WebInspector.panel = function(name)
 {
     return WebInspector.inspectorView.panel(name);
 }