[DevTools] Move subtargets functionality from ServiceWorker to Target domain.

third_party/WebKit/Source/devtools/front_end/resources/ServiceWorkersView.js

 // Copyright (c) 2015 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
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.ServiceWorkersView = function()
@@ skipping 15 matching lines @@
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         var securityOriginManager = WebInspector.SecurityOriginManager.fromTarget(target);
         if (this._manager || !target.serviceWorkerManager || !securityOriginManager)
             return;
         this._manager = target.serviceWorkerManager;
+        this._subTargetsManager = target.subTargetsManager;
         this._securityOriginManager = securityOriginManager;
 
         this._toolbar.appendToolbarItem(WebInspector.NetworkConditionsSelector.createOfflineToolbarCheckbox());
         var forceUpdate = new WebInspector.ToolbarCheckbox(WebInspector.UIString("Update on reload"), WebInspector.UIString("Force update Service Worker on page reload"), this._manager.forceUpdateOnReloadSetting());
         this._toolbar.appendToolbarItem(forceUpdate);
         var networkManager = target && WebInspector.NetworkManager.fromTarget(target);
         if (networkManager) {
             var fallbackToNetwork = new WebInspector.ToolbarCheckbox(WebInspector.UIString("Bypass for network"), WebInspector.UIString("Bypass Service Worker and load resources from the network"), networkManager.bypassServiceWorkerSetting());
             this._toolbar.appendToolbarItem(fallbackToNetwork);
             this._toolbar.appendSpacer();
@@ skipping 55 matching lines @@
         section._addError(error);
     },
 
     /**
      * @param {!WebInspector.ServiceWorkerRegistration} registration
      */
     _updateRegistration: function(registration)
     {
         var section = this._sections.get(registration);
         if (!section) {
-            section = new WebInspector.ServiceWorkersView.Section(this._manager, this._reportView.appendSection(""), registration);
+            section = new WebInspector.ServiceWorkersView.Section(this._manager, this._subTargetsManager, this._reportView.appendSection(""), registration);
             this._sections.set(registration, section);
         }
         this._updateSectionVisibility();
         section._scheduleUpdate();
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _registrationDeleted: function(event)
     {
         var registration = /** @type {!WebInspector.ServiceWorkerRegistration} */ (event.data);
         var section = this._sections.get(registration);
         if (section)
             section._section.remove();
         this._sections.delete(registration);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @constructor
  * @param {!WebInspector.ServiceWorkerManager} manager
+ * @param {!WebInspector.SubTargetsManager} subTargetsManager
  * @param {!WebInspector.ReportView.Section} section
  * @param {!WebInspector.ServiceWorkerRegistration} registration
  */
-WebInspector.ServiceWorkersView.Section = function(manager, section, registration)
+WebInspector.ServiceWorkersView.Section = function(manager, subTargetsManager, section, registration)
 {
     this._manager = manager;
+    this._subTargetsManager = subTargetsManager;
     this._section = section;
     this._registration = registration;
 
     this._toolbar = section.createToolbar();
     this._toolbar.renderAsLinks();
     this._updateButton = new WebInspector.ToolbarButton(WebInspector.UIString("Update"), undefined, WebInspector.UIString("Update"));
     this._updateButton.addEventListener("click", this._updateButtonClicked.bind(this));
     this._toolbar.appendToolbarItem(this._updateButton);
     this._pushButton = new WebInspector.ToolbarButton(WebInspector.UIString("Emulate push event"), undefined, WebInspector.UIString("Push"));
     this._pushButton.addEventListener("click", this._pushButtonClicked.bind(this));
@@ skipping 25 matching lines @@
     _scheduleUpdate: function()
     {
         if (WebInspector.ServiceWorkersView._noThrottle) {
             this._update();
             return;
         }
         this._throttler.schedule(this._update.bind(this));
     },
 
     /**
+     * @param {string} versionId
+     * @return {?WebInspector.Target}
+     */
+    _targetForVersionId: function(versionId)
+    {
+        var version = this._manager.findVersion(versionId);
+        if (!version || !version.targetId)
+            return null;
+        return this._subTargetsManager.targetForId(version.targetId);
+    },
+
+    /**
      * @return {!Promise}
      */
     _update: function()
     {
         var fingerprint = this._registration.fingerprint();
         if (fingerprint === this._fingerprint)
             return Promise.resolve();
         this._fingerprint = fingerprint;
 
         this._toolbar.setEnabled(!this._registration.isDeleted);
@@ skipping 17 matching lines @@
             var fileName = WebInspector.ParsedURL.extractName(active.scriptURL);
             scriptElement.appendChild(WebInspector.linkifyURLAsNode(active.scriptURL, fileName));
             scriptElement.createChild("div", "report-field-value-subtitle").textContent = WebInspector.UIString("Received %s", new Date(active.scriptResponseTime * 1000).toLocaleString());
 
             var activeEntry = versionsStack.createChild("div", "service-worker-version");
             activeEntry.createChild("div", "service-worker-active-circle");
             activeEntry.createChild("span").textContent = WebInspector.UIString("#%s activated and is %s", active.id, active.runningStatus);
 
             if (active.isRunning() || active.isStarting()) {
                 createLink(activeEntry, WebInspector.UIString("stop"), this._stopButtonClicked.bind(this, active.id));
-                if (!this._manager.targetForVersionId(active.id))
+                if (!this._targetForVersionId(active.id))
                     createLink(activeEntry, WebInspector.UIString("inspect"), this._inspectButtonClicked.bind(this, active.id));
             } else if (active.isStartable()) {
                 createLink(activeEntry, WebInspector.UIString("start"), this._startButtonClicked.bind(this));
             }
 
             var clientsList = this._wrapWidget(this._section.appendField(WebInspector.UIString("Clients")));
             clientsList.removeChildren();
             this._section.setFieldVisible(WebInspector.UIString("Clients"), active.controlledClients.length);
             for (var client of active.controlledClients) {
                 var clientLabelText = clientsList.createChild("div", "service-worker-client");
                 if (this._clientInfoCache.has(client))
                     this._updateClientInfo(clientLabelText, /** @type {!WebInspector.TargetInfo} */(this._clientInfoCache.get(client)));
-                this._manager.getTargetInfo(client, this._onClientInfo.bind(this, clientLabelText));
+                this._subTargetsManager.getTargetInfo(client, this._onClientInfo.bind(this, clientLabelText));
             }
         }
 
         if (waiting) {
             var waitingEntry = versionsStack.createChild("div", "service-worker-version");
             waitingEntry.createChild("div", "service-worker-waiting-circle");
             waitingEntry.createChild("span").textContent = WebInspector.UIString("#%s waiting to activate", waiting.id);
             createLink(waitingEntry, WebInspector.UIString("skipWaiting"), this._skipButtonClicked.bind(this));
             waitingEntry.createChild("div", "service-worker-subtitle").textContent = new Date(waiting.scriptResponseTime * 1000).toLocaleString();
-            if (!this._manager.targetForVersionId(waiting.id) && (waiting.isRunning() || waiting.isStarting()))
+            if (!this._targetForVersionId(waiting.id) && (waiting.isRunning() || waiting.isStarting()))
                 createLink(waitingEntry, WebInspector.UIString("inspect"), this._inspectButtonClicked.bind(this, waiting.id));
         }
         if (installing) {
             var installingEntry = versionsStack.createChild("div", "service-worker-version");
             installingEntry.createChild("div", "service-worker-installing-circle");
             installingEntry.createChild("span").textContent = WebInspector.UIString("#%s installing", installing.id);
             installingEntry.createChild("div", "service-worker-subtitle").textContent = new Date(installing.scriptResponseTime * 1000).toLocaleString();
-            if (!this._manager.targetForVersionId(installing.id) && (installing.isRunning() || installing.isStarting()))
+            if (!this._targetForVersionId(installing.id) && (installing.isRunning() || installing.isStarting()))
                 createLink(installingEntry, WebInspector.UIString("inspect"), this._inspectButtonClicked.bind(this, installing.id));
         }
 
         this._section.setFieldVisible(WebInspector.UIString("Errors"), !!this._registration.errors.length);
         var errorsValue = this._wrapWidget(this._section.appendField(WebInspector.UIString("Errors")));
         var errorsLabel = createLabel(String(this._registration.errors.length), "error-icon");
         errorsLabel.classList.add("service-worker-errors-label");
         errorsValue.appendChild(errorsLabel);
         this._moreButton = createLink(errorsValue, this._errorsList.classList.contains("hidden") ? WebInspector.UIString("details") : WebInspector.UIString("hide"),  this._moreErrorsButtonClicked.bind(this));
         createLink(errorsValue, WebInspector.UIString("clear"), this._clearErrorsButtonClicked.bind(this));
@@ skipping 12 matching lines @@
             return span;
         }
         return Promise.resolve();
     },
 
     /**
      * @param {!ServiceWorkerAgent.ServiceWorkerErrorMessage} error
      */
     _addError: function(error)
     {
-        var target = this._manager.targetForVersionId(error.versionId);
+        var target = this._targetForVersionId(error.versionId);
         var message = this._errorsList.createChild("div");
         if (this._errorsList.childElementCount > 100)
             this._errorsList.firstElementChild.remove();
         message.appendChild(this._linkifier.linkifyScriptLocation(target, null, error.sourceURL, error.lineNumber));
         message.appendChild(createLabel("#" + error.versionId + ": " + error.errorMessage, "error-icon"));
     },
 
     _unregisterButtonClicked: function()
     {
         this._manager.deleteRegistration(this._registration.id);
@@ skipping 28 matching lines @@
         this._clientInfoCache.set(targetInfo.id, targetInfo);
         this._updateClientInfo(element, targetInfo);
     },
 
     /**
      * @param {!Element} element
      * @param {!WebInspector.TargetInfo} targetInfo
      */
     _updateClientInfo: function(element, targetInfo)
     {
-        if (!(targetInfo.isWebContents() || targetInfo.isFrame())) {
-            element.createTextChild(WebInspector.UIString("Worker: %s", targetInfo.url));
+        if (!targetInfo.canActivate) {
+            element.createTextChild(targetInfo.title);
             return;
         }
         element.removeChildren();
         element.createTextChild(targetInfo.url);
         var focusLabel = element.createChild("label", "link");
         focusLabel.createTextChild("focus");
         focusLabel.addEventListener("click", this._activateTarget.bind(this, targetInfo.id), true);
     },
 
     /**
      * @param {string} targetId
      */
     _activateTarget: function(targetId)
     {
-        this._manager.activateTarget(targetId);
+        this._subTargetsManager.activateTarget(targetId);
     },
 
     _startButtonClicked: function()
     {
         this._manager.startWorker(this._registration.scopeURL);
     },
 
     _skipButtonClicked: function()
     {
         this._manager.skipWaiting(this._registration.scopeURL);
@@ skipping 44 matching lines @@
         return contentElement;
     },
 
     _dispose: function()
     {
         this._linkifier.dispose();
         if (this._pendingUpdate)
             clearTimeout(this._pendingUpdate);
     }
 }