DevTools: move the force update SW on reload checkbox to the Resources / Service Workers view.

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()
 {
     WebInspector.VBox.call(this, true);
     this.registerRequiredCSS("resources/serviceWorkersView.css");
     this.contentElement.classList.add("service-workers-view");
 
     /** @type {!Set.<string>} */
     this._securityOriginHosts = new Set();
     /** @type {!Map.<string, !WebInspector.ServiceWorkerOriginWidget>} */
     this._originHostToOriginWidgetMap = new Map();
     /** @type {!Map.<string, !WebInspector.ServiceWorkerOriginWidget>} */
     this._registrationIdToOriginWidgetMap = new Map();
 
-    var settingsDiv = createElementWithClass("div", "service-workers-settings");
-    var debugOnStartCheckboxLabel = createCheckboxLabel(WebInspector.UIString("Open DevTools window and pause JavaScript execution on Service Worker startup for debugging."));

[horo, 2016/03/30 05:17:35]

Why do you remove this debugOnStartCheckbox?

[pfeldman, 2016/03/30 17:11:44]

It does not currently work in combination with the update on reload. What it
does is it spins off a new devtools window that tries to attach to a new SW, but
then existing DevTools window takes over. Furthermore, with the source of the SW
available, you can set a breakpoint and simply do update - this results in a
much cleaner behavior.

[horo, 2016/03/31 02:39:45]

OK. Sounds reasonable.
Please write about this in the CL description.

-    this._debugOnStartCheckbox = debugOnStartCheckboxLabel.checkboxElement;
-    this._debugOnStartCheckbox.addEventListener("change", this._debugOnStartCheckboxChanged.bind(this), false)
-    this._debugOnStartCheckbox.disabled = true
-    settingsDiv.appendChild(debugOnStartCheckboxLabel);
-    this.contentElement.appendChild(settingsDiv);
+    this._toolbar = new WebInspector.Toolbar("", this.contentElement);
 
     this._root = this.contentElement.createChild("div");
     this._root.classList.add("service-workers-root");
 
     WebInspector.targetManager.observeTargets(this);
 }
 
 WebInspector.ServiceWorkersView.prototype = {
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         if (this._target)
             return;
         this._target = target;
         this._manager = this._target.serviceWorkerManager;
 
-        this._debugOnStartCheckbox.disabled = false;
-        this._debugOnStartCheckbox.checked = this._manager.debugOnStart();
+        var forceUpdate = new WebInspector.ToolbarCheckbox(WebInspector.UIString("Update on reload"), WebInspector.UIString("Update Service Worker on page reload"), this._manager.forceUpdateOnReloadSetting());
+        this._toolbar.appendToolbarItem(forceUpdate);
+
         for (var registration of this._manager.registrations().values())
             this._updateRegistration(registration);
 
         this._manager.addEventListener(WebInspector.ServiceWorkerManager.Events.RegistrationUpdated, this._registrationUpdated, this);
         this._manager.addEventListener(WebInspector.ServiceWorkerManager.Events.RegistrationDeleted, this._registrationDeleted, this);
-        this._manager.addEventListener(WebInspector.ServiceWorkerManager.Events.DebugOnStartUpdated, this._debugOnStartUpdated, this);
         this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginAdded, this._securityOriginAdded, this);
         this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.SecurityOriginRemoved, this._securityOriginRemoved, this);
         var securityOrigins = this._target.resourceTreeModel.securityOrigins();
         for (var i = 0; i < securityOrigins.length; ++i)
             this._addOrigin(securityOrigins[i]);
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
@@ skipping 49 matching lines @@
         if (originWidget._hasRegistration())
             return;
         if (this._securityOriginHosts.has(originWidget._originHost))
             originWidget.detach();
         this._originHostToOriginWidgetMap.delete(originWidget._originHost);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
-    _debugOnStartUpdated: function(event)
-    {
-        var debugOnStart = /** @type {boolean} */ (event.data);
-        this._debugOnStartCheckbox.checked = debugOnStart;
-    },
-
-    /**
-     * @param {!WebInspector.Event} event
-     */
     _securityOriginAdded: function(event)
     {
         this._addOrigin(/** @type {string} */ (event.data));
     },
 
     /**
      * @param {string} securityOrigin
      */
     _addOrigin: function(securityOrigin)
     {
@@ skipping 22 matching lines @@
         var originHost = parsedURL.host;
         if (!this._securityOriginHosts.has(originHost))
             return;
         this._securityOriginHosts.delete(originHost);
         var originWidget = this._originHostToOriginWidgetMap.get(originHost);
         if (!originWidget)
           return;
         originWidget.detach();
     },
 
-    _debugOnStartCheckboxChanged: function()
-    {
-        if (!this._manager)
-            return;
-        this._manager.setDebugOnStart(this._debugOnStartCheckbox.checked);

[dgozman, 2016/03/30 21:09:54]

Remove it from manager, protocol and backend.

[pfeldman, 2016/03/31 05:02:31]

Done.

-        this._debugOnStartCheckbox.checked = this._manager.debugOnStart();
-    },
-
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @param {!WebInspector.ServiceWorkerManager} manager
  * @param {string} originHost
  */
 WebInspector.ServiceWorkerOriginWidget = function(manager, originHost)
@@ skipping 371 matching lines @@
      * @param {string} versionId
      * @param {!Event} event
      */
     _inspectButtonClicked: function(versionId, event)
     {
         this._manager.inspectWorker(versionId);
     },
 
     __proto__: WebInspector.VBox.prototype
 }