[DevTools] No longer store security origins in ResourceTreeModel

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

 // Copyright (c) 2016 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}
  * @param {!WebInspector.ResourcesPanel} resourcesPanel
  */
@@ skipping 24 matching lines @@
     var storage = this._reportView.appendSection(WebInspector.UIString("Storage"));
     this._appendItem(storage, WebInspector.UIString("Local and session storage"), "local_storage");
     this._appendItem(storage, WebInspector.UIString("Indexed DB"), "indexeddb");
     this._appendItem(storage, WebInspector.UIString("Web SQL"), "websql");
     this._appendItem(storage, WebInspector.UIString("Cookies"), "cookies");
 
     var caches = this._reportView.appendSection(WebInspector.UIString("Cache"));
     this._appendItem(caches, WebInspector.UIString("Cache storage"), "cache_storage");
     this._appendItem(caches, WebInspector.UIString("Application cache"), "appcache");
 
-    WebInspector.targetManager.observeTargets(this);
+    WebInspector.targetManager.observeTargets(this, WebInspector.Target.Capability.Browser);
     var footer = this._reportView.appendSection("", "clear-storage-button").appendRow();
     this._clearButton = createTextButton(WebInspector.UIString("Clear site data"), this._clear.bind(this), WebInspector.UIString("Clear site data"));
     footer.appendChild(this._clearButton);
 }
 
 WebInspector.ClearStorageView.prototype = {
 
     /**
      * @param {!WebInspector.ReportView.Section} section
      * @param {string} title
      * @param {string} settingName
      */
     _appendItem: function(section, title, settingName)
     {
         var row = section.appendRow();
         row.appendChild(WebInspector.SettingsUI.createSettingCheckbox(title, this._settings.get(settingName), true));
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         if (this._target)
             return;
         this._target = target;
-        this._updateOrigin(target.resourceTreeModel.mainFrame ? target.resourceTreeModel.mainFrame.url : "");
-        WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._updateFrame, this);
+        var securityOriginManager = WebInspector.SecurityOriginManager.fromTarget(target);
+        this._updateOrigin(securityOriginManager.mainSecurityOrigin());
+        securityOriginManager.addEventListener(WebInspector.SecurityOriginManager.EventTypes.MainSecurityOriginChanged, this._originChanged, this);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
-    _updateFrame: function(event)
+    _originChanged: function(event)
     {
-        var frame = /** *@type {!WebInspector.ResourceTreeFrame} */ (event.data);
-        this._updateOrigin(frame.url);
+        var origin = /** *@type {string} */ (event.data);
+        this._updateOrigin(origin);
     },
 
     /**
      * @param {string} url
      */
     _updateOrigin: function(url)
     {
         this._securityOrigin = new WebInspector.ParsedURL(url).securityOrigin();
         this._reportView.setSubtitle(this._securityOrigin);
     },
@@ skipping 30 matching lines @@
         if (set.has(StorageAgent.StorageType.Websql) || hasAll) {
             var databaseModel = WebInspector.DatabaseModel.fromTarget(this._target);
             if (databaseModel) {
                 databaseModel.disable();
                 databaseModel.enable();
             }
         }
 
         if (set.has(StorageAgent.StorageType.Cache_storage) || hasAll) {
             var target = WebInspector.targetManager.mainTarget();
-            if (target) {
-                var model = WebInspector.ServiceWorkerCacheModel.fromTarget(target);
-                if (model)
-                    model.clearForOrigin(this._securityOrigin);
-            }
+            var model = target && WebInspector.ServiceWorkerCacheModel.fromTarget(target);
+            if (model)
+                model.clearForOrigin(this._securityOrigin);
         }
 
         if (set.has(StorageAgent.StorageType.Appcache) || hasAll) {
             var appcacheModel = WebInspector.ApplicationCacheModel.fromTarget(this._target);
             if (appcacheModel)
                 appcacheModel.reset();
         }
 
         this._clearButton.disabled = true;
         this._clearButton.textContent = WebInspector.UIString("Clearing...");
         setTimeout(() => {
             this._clearButton.disabled = false;
             this._clearButton.textContent = WebInspector.UIString("Clear selected");
         }, 500);
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
     },
 
     __proto__: WebInspector.VBox.prototype
 }