[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 75 matching lines @@
                 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()))
@@ skipping 79 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())) {
+        if (targetInfo.type !== TargetAgent.TargetType.Page && targetInfo.type !== TargetAgent.TargetType.Frame) {
             element.createTextChild(WebInspector.UIString("Worker: %s", targetInfo.url));
             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);
     }
 }