[DevTools] Move main target/connection to TargetManager.

third_party/WebKit/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 189 matching lines @@
         new WebInspector.NetworkPanelIndicator();
         new WebInspector.SourcesPanelIndicator();
         new WebInspector.BackendSettingsSync();
         WebInspector.domBreakpointsSidebarPane = new WebInspector.DOMBreakpointsSidebarPane();
 
         WebInspector.actionRegistry = new WebInspector.ActionRegistry();
         WebInspector.shortcutRegistry = new WebInspector.ShortcutRegistry(WebInspector.actionRegistry, document);
         WebInspector.ShortcutsScreen.registerShortcuts();
         this._registerForwardedShortcuts();
         this._registerMessageSinkListener();
+        new WebInspector.Main.InspectorDomainObserver();
 
         self.runtime.extension(WebInspector.AppProvider).instance().then(this._showAppUI.bind(this));
         console.timeEnd("Main._createAppUI");
     },
 
     /**
      * @param {!Object} appProvider
      * @suppressGlobalPropertiesCheck
      */
     _showAppUI: function(appProvider)
@@ skipping 39 matching lines @@
 
     _didInitializeFileSystemManager: function()
     {
         this._fileSystemManagerInitialized = true;
         if (this._appUIShown)
             this._initializeTarget();
     },
 
     _initializeTarget: function()
     {
-        this._connectAndCreateTarget();
+        console.time("Main._initializeTarget");
+        WebInspector.targetManager.connectToMainTarget(webSocketConnectionLost);
+
         InspectorFrontendHost.readyForTest();
-        WebInspector.targetManager.setMainConnectionInterceptor(this._interceptMainConnection.bind(this));
         // Asynchronously run the extensions.
         setTimeout(this._lateInitialization.bind(this), 100);
-    },
+        console.timeEnd("Main._initializeTarget");
 
-    _connectAndCreateTarget: function()
-    {
-        console.time("Main._connectAndCreateTarget");
-
-        var capabilities =
-            WebInspector.Target.Capability.Browser | WebInspector.Target.Capability.DOM |
-            WebInspector.Target.Capability.JS | WebInspector.Target.Capability.Log |
-            WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Target;
-        if (Runtime.queryParam("isSharedWorker")) {
-            capabilities =
-                WebInspector.Target.Capability.Browser | WebInspector.Target.Capability.Log |
-                WebInspector.Target.Capability.Network | WebInspector.Target.Capability.Target;
-        } else if (Runtime.queryParam("v8only")) {
-            capabilities = WebInspector.Target.Capability.JS;
-        }
-
-        var target = WebInspector.targetManager.createTarget(WebInspector.UIString("Main"), capabilities, this._createMainConnection.bind(this), null);
-        target.registerInspectorDispatcher(new WebInspector.Main.InspectorDomainDispatcher(target));
-        target.runtimeAgent().runIfWaitingForDebugger();
-        if (target.hasBrowserCapability())
-            target.inspectorAgent().enable();
-
-        console.timeEnd("Main._connectAndCreateTarget");
-    },
-
-    /**
-     * @param {function(string)} onMessage
-     * @return {!Promise<!InspectorBackendClass.Connection>}
-     */
-    _interceptMainConnection: function(onMessage)
-    {
-        var params = {
-            onMessage: onMessage,
-            onDisconnect: this._connectAndCreateTarget.bind(this)
-        };
-        return this._connection.disconnect().then(this._createMainConnection.bind(this, params));
-    },
-
-    /**
-     * @param {!InspectorBackendClass.Connection.Params} params
-     * @return {!InspectorBackendClass.Connection}
-     */
-    _createMainConnection: function(params)
-    {
-        if (Runtime.queryParam("ws")) {
-            var ws = "ws://" + Runtime.queryParam("ws");
-            params.onDisconnect = onDisconnect.bind(null, params.onDisconnect);
-            this._connection = new WebInspector.WebSocketConnection(ws, params);
-        } else if (InspectorFrontendHost.isHostedMode()) {
-            this._connection = new WebInspector.StubConnection(params);
-        } else {
-            this._connection = new WebInspector.MainConnection(params);
-        }
-        return this._connection;
-
-        /**
-         * @param {function(string)} callback
-         * @param {string} reason
-         */
-        function onDisconnect(callback, reason)
+        function webSocketConnectionLost()
         {
             if (!WebInspector._disconnectedScreenWithReasonWasShown)
-                WebInspector.RemoteDebuggingTerminatedScreen.show(reason);
-            callback(reason);
+                WebInspector.RemoteDebuggingTerminatedScreen.show("WebSocket disconnected");
         }
     },
 
     _lateInitialization: function()
     {
         console.timeStamp("Main._lateInitialization");
         this._registerShortcuts();
         WebInspector.extensionServer.initializeExtensions();
     },
 
@@ skipping 198 matching lines @@
 
     _onSuspendStateChanged: function()
     {
         var suspended = WebInspector.targetManager.allTargetsSuspended();
         WebInspector.inspectorView.onSuspendStateChanged(suspended);
     }
 };
 
 /**
  * @constructor
+ * @implements {WebInspector.TargetManager.Observer}
+ */
+WebInspector.Main.InspectorDomainObserver = function()
+{
+    WebInspector.targetManager.observeTargets(this, WebInspector.Target.Capability.Browser);
+};
+
+WebInspector.Main.InspectorDomainObserver.prototype = {
+    /**
+     * @override
+     * @param {!WebInspector.Target} target
+     */
+    targetAdded: function(target)
+    {
+        target.registerInspectorDispatcher(new WebInspector.Main.InspectorDomainDispatcher(target));
+        target.inspectorAgent().enable();
+    },
+
+    /**
+     * @override
+     * @param {!WebInspector.Target} target
+     */
+    targetRemoved: function(target)
+    {
+    },
+};
+
+/**
+ * @constructor
  * @implements {InspectorAgent.Dispatcher}
  * @param {!WebInspector.Target} target
  */
 WebInspector.Main.InspectorDomainDispatcher = function(target)
 {
     this._target = target;
 };
 
 WebInspector.Main.InspectorDomainDispatcher.prototype = {
     /**
@@ skipping 544 matching lines @@
      * @override
      * @return {?Element}
      */
     settingElement: function()
     {
         return WebInspector.SettingsUI.createSettingCheckbox(WebInspector.UIString("Show rulers"), WebInspector.moduleSetting("showMetricsRulers"));
     }
 };
 
 new WebInspector.Main();