[DevTools] Separate old Application tab code

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

Index: third_party/WebKit/Source/devtools/front_end/resources/ApplicationPanelSidebar.js
diff --git a/third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js b/third_party/WebKit/Source/devtools/front_end/resources/ApplicationPanelSidebar.js
similarity index 86%
copy from third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js
copy to third_party/WebKit/Source/devtools/front_end/resources/ApplicationPanelSidebar.js
index 2229844043a037c2238ccf6864a77ac10a27a075..4836c57d317bfeecf7d900fc664c90a04011d641 100644
--- a/third_party/WebKit/Source/devtools/front_end/resources/ResourcesPanel.js
+++ b/third_party/WebKit/Source/devtools/front_end/resources/ApplicationPanelSidebar.js
@@ -31,69 +31,66 @@
  * @implements {SDK.TargetManager.Observer}
  * @unrestricted
  */
-Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
-  constructor() {
-    super('resources');
-    this.registerRequiredCSS('resources/resourcesPanel.css');
+Resources.ApplicationPanelSidebar = class extends UI.VBox {
+  /**
+   * @param {!Resources.ResourcesPanel} panel
+   */
+  constructor(panel) {
+    super();
 
-    this._resourcesLastSelectedItemSetting = Common.settings.createSetting('resourcesLastSelectedItem', {});
+    this._panel = panel;
 
     this._sidebarTree = new UI.TreeOutlineInShadow();
     this._sidebarTree.element.classList.add('resources-sidebar');
     this._sidebarTree.registerRequiredCSS('resources/resourcesSidebar.css');
     this._sidebarTree.element.classList.add('filter-all');
-    this.panelSidebarElement().appendChild(this._sidebarTree.element);
+    this.contentElement.appendChild(this._sidebarTree.element);
 
     this._applicationTreeElement = this._addSidebarSection(Common.UIString('Application'));
-    this._manifestTreeElement = new Resources.AppManifestTreeElement(this);
+    this._manifestTreeElement = new Resources.AppManifestTreeElement(panel);
     this._applicationTreeElement.appendChild(this._manifestTreeElement);
-    this.serviceWorkersTreeElement = new Resources.ServiceWorkersTreeElement(this);
+    this.serviceWorkersTreeElement = new Resources.ServiceWorkersTreeElement(panel);
     this._applicationTreeElement.appendChild(this.serviceWorkersTreeElement);
-    var clearStorageTreeElement = new Resources.ClearStorageTreeElement(this);
+    var clearStorageTreeElement = new Resources.ClearStorageTreeElement(panel);
     this._applicationTreeElement.appendChild(clearStorageTreeElement);
 
     var storageTreeElement = this._addSidebarSection(Common.UIString('Storage'));
     this.localStorageListTreeElement =
-        new Resources.StorageCategoryTreeElement(this, Common.UIString('Local Storage'), 'LocalStorage');
+        new Resources.StorageCategoryTreeElement(panel, Common.UIString('Local Storage'), 'LocalStorage');
     var localStorageIcon = UI.Icon.create('mediumicon-table', 'resource-tree-item');
     this.localStorageListTreeElement.setLeadingIcons([localStorageIcon]);
 
     storageTreeElement.appendChild(this.localStorageListTreeElement);
     this.sessionStorageListTreeElement =
-        new Resources.StorageCategoryTreeElement(this, Common.UIString('Session Storage'), 'SessionStorage');
+        new Resources.StorageCategoryTreeElement(panel, Common.UIString('Session Storage'), 'SessionStorage');
     var sessionStorageIcon = UI.Icon.create('mediumicon-table', 'resource-tree-item');
     this.sessionStorageListTreeElement.setLeadingIcons([sessionStorageIcon]);
 
     storageTreeElement.appendChild(this.sessionStorageListTreeElement);
-    this.indexedDBListTreeElement = new Resources.IndexedDBTreeElement(this);
+    this.indexedDBListTreeElement = new Resources.IndexedDBTreeElement(panel);
     storageTreeElement.appendChild(this.indexedDBListTreeElement);
     this.databasesListTreeElement =
-        new Resources.StorageCategoryTreeElement(this, Common.UIString('Web SQL'), 'Databases');
+        new Resources.StorageCategoryTreeElement(panel, Common.UIString('Web SQL'), 'Databases');
     var databaseIcon = UI.Icon.create('mediumicon-database', 'resource-tree-item');
     this.databasesListTreeElement.setLeadingIcons([databaseIcon]);
 
     storageTreeElement.appendChild(this.databasesListTreeElement);
-    this.cookieListTreeElement = new Resources.StorageCategoryTreeElement(this, Common.UIString('Cookies'), 'Cookies');
+    this.cookieListTreeElement = new Resources.StorageCategoryTreeElement(panel, Common.UIString('Cookies'), 'Cookies');
     var cookieIcon = UI.Icon.create('mediumicon-cookie', 'resource-tree-item');
     this.cookieListTreeElement.setLeadingIcons([cookieIcon]);
     storageTreeElement.appendChild(this.cookieListTreeElement);
 
     var cacheTreeElement = this._addSidebarSection(Common.UIString('Cache'));
-    this.cacheStorageListTreeElement = new Resources.ServiceWorkerCacheTreeElement(this);
+    this.cacheStorageListTreeElement = new Resources.ServiceWorkerCacheTreeElement(panel);
     cacheTreeElement.appendChild(this.cacheStorageListTreeElement);
     this.applicationCacheListTreeElement =
-        new Resources.StorageCategoryTreeElement(this, Common.UIString('Application Cache'), 'ApplicationCache');
+        new Resources.StorageCategoryTreeElement(panel, Common.UIString('Application Cache'), 'ApplicationCache');
     var applicationCacheIcon = UI.Icon.create('mediumicon-table', 'resource-tree-item');
     this.applicationCacheListTreeElement.setLeadingIcons([applicationCacheIcon]);
 
     cacheTreeElement.appendChild(this.applicationCacheListTreeElement);
 
-    this._resourcesSection = new Resources.ResourcesSection(this, this._addSidebarSection(Common.UIString('Frames')));
-
-    var mainContainer = new UI.VBox();
-    this.storageViews = mainContainer.element.createChild('div', 'vbox flex-auto');
-    this._storageViewToolbar = new UI.Toolbar('resources-toolbar', mainContainer.element);
-    this.splitWidget().setMainWidget(mainContainer);
+    this._resourcesSection = new Resources.ResourcesSection(panel, this._addSidebarSection(Common.UIString('Frames')));
 
     /** @type {!Map.<!Resources.Database, !Object.<string, !Resources.DatabaseTableView>>} */
     this._databaseTableViews = new Map();
@@ -106,13 +103,8 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
     /** @type {!Object.<string, boolean>} */
     this._domains = {};
 
-    /** @type {?Resources.DOMStorageItemsView} */
-    this._domStorageView = null;
-    /** @type {?Resources.CookieItemsView} */
-    this._cookieView = null;
-
-    this.panelSidebarElement().addEventListener('mousemove', this._onmousemove.bind(this), false);
-    this.panelSidebarElement().addEventListener('mouseleave', this._onmouseleave.bind(this), false);
+    this._sidebarTree.contentElement.addEventListener('mousemove', this._onmousemove.bind(this), false);
+    this._sidebarTree.contentElement.addEventListener('mouseleave', this._onmouseleave.bind(this), false);
 
     SDK.targetManager.observeTargets(this);
     SDK.targetManager.addModelListener(
@@ -120,13 +112,6 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
   }
 
   /**
-   * @return {!Resources.ResourcesPanel}
-   */
-  static _instance() {
-    return /** @type {!Resources.ResourcesPanel} */ (self.runtime.sharedInstance(Resources.ResourcesPanel));
-  }
-
-  /**
    * @param {string} title
    * @return {!UI.TreeElement}
    */
@@ -211,12 +196,13 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
     if (domStorageModel)
       this._populateDOMStorageTree(domStorageModel);
     this.indexedDBListTreeElement._initialize();
-    this.cacheStorageListTreeElement._initialize();
+    var serviceWorkerCacheModel = SDK.ServiceWorkerCacheModel.fromTarget(this._target);
+    this.cacheStorageListTreeElement._initialize(serviceWorkerCacheModel);
     this._initDefaultSelection();
   }
 
   _initDefaultSelection() {
-    var itemURL = this._resourcesLastSelectedItemSetting.get();
+    var itemURL = this._panel.lastSelectedItemURL();
     if (itemURL) {
       var rootElement = this._sidebarTree.rootElement();
       for (var treeElement = rootElement.firstChild(); treeElement;
@@ -236,12 +222,6 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
   }
 
   _resetWebSQL() {
-    if (this.visibleView instanceof Resources.DatabaseQueryView ||
-        this.visibleView instanceof Resources.DatabaseTableView) {
-      this.visibleView.detach();
-      delete this.visibleView;
-    }
-
     var queryViews = this._databaseQueryViews.valuesArray();
     for (var i = 0; i < queryViews.length; ++i) {
       queryViews[i].removeEventListener(
@@ -255,29 +235,16 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
   }
 
   _resetDOMStorage() {
-    if (this.visibleView === this._domStorageView) {
-      this.visibleView.detach();
-      delete this.visibleView;
-    }
-
     this._domStorageTreeElements.clear();
     this.localStorageListTreeElement.removeChildren();
     this.sessionStorageListTreeElement.removeChildren();
   }
 
   _resetCookies() {
-    if (this.visibleView instanceof Resources.CookieItemsView) {
-      this.visibleView.detach();
-      delete this.visibleView;
-    }
     this.cookieListTreeElement.removeChildren();
   }
 
   _resetCacheStorage() {
-    if (this.visibleView instanceof Resources.ServiceWorkerCacheView) {
-      this.visibleView.detach();
-      delete this.visibleView;
-    }
     this.cacheStorageListTreeElement.removeChildren();
     this.cacheStorageListTreeElement.setExpandable(false);
   }
@@ -296,13 +263,7 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
     this._resetCacheStorage();
     // No need to this._resetAppCache.
 
-    if ((this.visibleView instanceof SourceFrame.ResourceSourceFrame) ||
-        (this.visibleView instanceof SourceFrame.ImageView) || (this.visibleView instanceof SourceFrame.FontView)) {
-      this.visibleView.detach();
-      delete this.visibleView;
-    }
-
-    this._storageViewToolbar.removeToolbarItems();
+    this._panel.resetView();
 
     if (this._sidebarTree.selectedTreeElement)
       this._sidebarTree.selectedTreeElement.deselect();
@@ -340,7 +301,7 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
     var domain = parsedURL.securityOrigin();
     if (!this._domains[domain]) {
       this._domains[domain] = true;
-      var cookieDomainTreeElement = new Resources.CookieTreeElement(this, frame, domain);
+      var cookieDomainTreeElement = new Resources.CookieTreeElement(this._panel, frame, domain);
       this.cookieListTreeElement.appendChild(cookieDomainTreeElement);
     }
   }
@@ -359,7 +320,7 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
   _addDOMStorage(domStorage) {
     console.assert(!this._domStorageTreeElements.get(domStorage));
 
-    var domStorageTreeElement = new Resources.DOMStorageTreeElement(this, domStorage);
+    var domStorageTreeElement = new Resources.DOMStorageTreeElement(this._panel, domStorage);
     this._domStorageTreeElements.set(domStorage, domStorageTreeElement);
     if (domStorage.isLocalStorage)
       this.localStorageListTreeElement.appendChild(domStorageTreeElement);
@@ -401,16 +362,6 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
   }
 
   /**
-   * @param {!Resources.DOMStorage} domStorage
-   */
-  selectDOMStorage(domStorage) {
-    if (domStorage) {
-      this._showDOMStorage(domStorage);
-      this._domStorageTreeElements.get(domStorage).select();
-    }
-  }
-
-  /**
    * @param {!SDK.Resource} resource
    * @param {number=} line
    * @param {number=} column
@@ -472,46 +423,7 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
     this._innerShowView(view);
   }
 
-  /**
-   * @param {!Resources.DOMStorage} domStorage
-   */
-  _showDOMStorage(domStorage) {
-    if (!domStorage)
-      return;
-
-    if (!this._domStorageView)
-      this._domStorageView = new Resources.DOMStorageItemsView(domStorage);
-    else
-      this._domStorageView.setStorage(domStorage);
-    this._innerShowView(this._domStorageView);
-  }
-
-  /**
-   * @param {!Resources.CookieTreeElement} treeElement
-   * @param {string} cookieDomain
-   * @param {!SDK.Target} cookieFrameTarget
-   */
-  showCookies(treeElement, cookieDomain, cookieFrameTarget) {
-    var model = SDK.CookieModel.fromTarget(cookieFrameTarget);
-    if (!this._cookieView)
-      this._cookieView = new Resources.CookieItemsView(treeElement, model, cookieDomain);
-    else
-      this._cookieView.setCookiesDomain(model, cookieDomain);
-    this._innerShowView(this._cookieView);
-  }
-
-  /**
-   * @param {!SDK.Target} target
-   * @param {string} cookieDomain
-   */
-  _clearCookies(target, cookieDomain) {
-    SDK.CookieModel.fromTarget(target).clear(cookieDomain, () => {
-      if (this._cookieView)
-        this._cookieView.refreshItems();
-    });
-  }
-
-  showApplicationCache(frameId) {
+  _showApplicationCache(frameId) {
     if (!this._applicationCacheViews[frameId]) {
       this._applicationCacheViews[frameId] =
           new Resources.ApplicationCacheItemsView(this._applicationCacheModel, frameId);
@@ -527,35 +439,8 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
     this._innerShowView(view);
   }
 
-  showCategoryView(categoryName) {
-    if (!this._categoryView)
-      this._categoryView = new Resources.StorageCategoryView();
-    this._categoryView.setText(categoryName);
-    this._innerShowView(this._categoryView);
-  }
-
   _innerShowView(view) {
-    if (this.visibleView === view)
-      return;
-
-    if (this.visibleView)
-      this.visibleView.detach();
-
-    view.show(this.storageViews);
-    this.visibleView = view;
-
-    this._storageViewToolbar.removeToolbarItems();
-    var toolbarItems = (view instanceof UI.SimpleView && view.syncToolbarItems()) || [];
-    for (var i = 0; i < toolbarItems.length; ++i)
-      this._storageViewToolbar.appendToolbarItem(toolbarItems[i]);
-    this._storageViewToolbar.element.classList.toggle('hidden', !toolbarItems.length);
-  }
-
-  closeVisibleView() {
-    if (!this.visibleView)
-      return;
-    this.visibleView.detach();
-    delete this.visibleView;
+    this._panel.showView(view);
   }
 
   _updateDatabaseTables(event) {
@@ -575,7 +460,7 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
       return;
 
     var tableNamesHash = {};
-    var self = this;
+    var panel = this._panel;
     function tableNamesCallback(tableNames) {
       var tableNamesLength = tableNames.length;
       for (var i = 0; i < tableNamesLength; ++i)
@@ -583,8 +468,8 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
 
       for (var tableName in tableViews) {
         if (!(tableName in tableNamesHash)) {
-          if (self.visibleView === tableViews[tableName])
-            self.closeVisibleView();
+          if (panel.visibleView === tableViews[tableName])
+            panel.showView(null);
           delete tableViews[tableName];
         }
       }
@@ -632,12 +517,13 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
 
     var manifestTreeElement = this._applicationCacheManifestElements[manifestURL];
     if (!manifestTreeElement) {
-      manifestTreeElement = new Resources.ApplicationCacheManifestTreeElement(this, manifestURL);
+      manifestTreeElement = new Resources.ApplicationCacheManifestTreeElement(this._panel, manifestURL);
       this.applicationCacheListTreeElement.appendChild(manifestTreeElement);
       this._applicationCacheManifestElements[manifestURL] = manifestTreeElement;
     }
 
-    var frameTreeElement = new Resources.ApplicationCacheFrameTreeElement(this, frameId, manifestURL);
+    var model = SDK.ResourceTreeModel.fromTarget(this._target);
+    var frameTreeElement = new Resources.ApplicationCacheFrameTreeElement(this, model.frameForId(frameId), manifestURL);
     manifestTreeElement.appendChild(frameTreeElement);
     manifestTreeElement.expand();
     this._applicationCacheFrameElements[frameId] = frameTreeElement;
@@ -715,24 +601,6 @@ Resources.ResourcesPanel = class extends UI.PanelWithSidebar {
 };
 
 /**
- * @implements {Common.Revealer}
- * @unrestricted
- */
-Resources.ResourcesPanel.ResourceRevealer = class {
-  /**
-   * @override
-   * @param {!Object} resource
-   * @return {!Promise}
-   */
-  reveal(resource) {
-    if (!(resource instanceof SDK.Resource))
-      return Promise.reject(new Error('Internal error: not a resource'));
-    var panel = Resources.ResourcesPanel._instance();
-    return UI.viewManager.showView('resources').then(panel.showResource.bind(panel, resource));
-  }
-};
-
-/**
  * @unrestricted
  */
 Resources.BaseStorageTreeElement = class extends UI.TreeElement {
@@ -755,7 +623,7 @@ Resources.BaseStorageTreeElement = class extends UI.TreeElement {
       return false;
     var itemURL = this.itemURL;
     if (itemURL)
-      this._storagePanel._resourcesLastSelectedItemSetting.set(itemURL);
+      this._storagePanel.setLastSelectedItemURL(itemURL);
     return false;
   }
 
@@ -764,17 +632,10 @@ Resources.BaseStorageTreeElement = class extends UI.TreeElement {
    * @param {?UI.Widget} view
    */
   showView(view) {
-    if (!view) {
-      this._storagePanel.visibleView.detach();
-      return;
-    }
-    this._storagePanel._innerShowView(view);
+    this._storagePanel.showView(view);
   }
 };
 
-/**
- * @unrestricted
- */
 Resources.StorageCategoryTreeElement = class extends Resources.BaseStorageTreeElement {
   /**
    * @param {!Resources.ResourcesPanel} storagePanel
@@ -788,12 +649,6 @@ Resources.StorageCategoryTreeElement = class extends Resources.BaseStorageTreeEl
     this._categoryName = categoryName;
   }
 
-  /**
-   * @return {!SDK.Target}
-   */
-  target() {
-    return this._storagePanel._target;
-  }
 
   get itemURL() {
     return 'category://' + this._categoryName;
@@ -838,11 +693,12 @@ Resources.StorageCategoryTreeElement = class extends Resources.BaseStorageTreeEl
  */
 Resources.DatabaseTreeElement = class extends Resources.BaseStorageTreeElement {
   /**
-   * @param {!Resources.ResourcesPanel} storagePanel
+   * @param {!Resources.ApplicationPanelSidebar} sidebar
    * @param {!Resources.Database} database
    */
-  constructor(storagePanel, database) {
-    super(storagePanel, database.name, true);
+  constructor(sidebar, database) {
+    super(sidebar._panel, database.name, true);
+    this._sidebar = sidebar;
     this._database = database;
 
     var icon = UI.Icon.create('mediumicon-database', 'resource-tree-item');
@@ -859,7 +715,7 @@ Resources.DatabaseTreeElement = class extends Resources.BaseStorageTreeElement {
    */
   onselect(selectedByUser) {
     super.onselect(selectedByUser);
-    this._storagePanel._showDatabase(this._database);
+    this._sidebar._showDatabase(this._database);
     return false;
   }
 
@@ -890,8 +746,9 @@ Resources.DatabaseTreeElement = class extends Resources.BaseStorageTreeElement {
  * @unrestricted
  */
 Resources.DatabaseTableTreeElement = class extends Resources.BaseStorageTreeElement {
-  constructor(storagePanel, database, tableName) {
-    super(storagePanel, tableName, false);
+  constructor(sidebar, database, tableName) {
+    super(sidebar._panel, tableName, false);
+    this._sidebar = sidebar;
     this._database = database;
     this._tableName = tableName;
     var icon = UI.Icon.create('mediumicon-table', 'resource-tree-item');
@@ -908,7 +765,7 @@ Resources.DatabaseTableTreeElement = class extends Resources.BaseStorageTreeElem
    */
   onselect(selectedByUser) {
     super.onselect(selectedByUser);
-    this._storagePanel._showDatabase(this._database, this._tableName);
+    this._sidebar._showDatabase(this._database, this._tableName);
     return false;
   }
 };
@@ -924,13 +781,17 @@ Resources.ServiceWorkerCacheTreeElement = class extends Resources.StorageCategor
     super(storagePanel, Common.UIString('Cache Storage'), 'CacheStorage');
     var icon = UI.Icon.create('mediumicon-database', 'resource-tree-item');
     this.setLeadingIcons([icon]);
+    /** @type {?SDK.ServiceWorkerCacheModel} */
+    this._swCacheModel = null;
   }
 
-  _initialize() {
+  /**
+   * @param {?SDK.ServiceWorkerCacheModel} model
+   */
+  _initialize(model) {
     /** @type {!Array.<!Resources.SWCacheTreeElement>} */
     this._swCacheTreeElements = [];
-    var target = this._storagePanel._target;
-    var model = target && SDK.ServiceWorkerCacheModel.fromTarget(target);
+    this._swCacheModel = model;
     if (model) {
       for (var cache of model.caches())
         this._addCache(model, cache);
@@ -956,13 +817,8 @@ Resources.ServiceWorkerCacheTreeElement = class extends Resources.StorageCategor
   }
 
   _refreshCaches() {
-    var target = this._storagePanel._target;
-    if (target) {
-      var model = SDK.ServiceWorkerCacheModel.fromTarget(target);
-      if (!model)
-        return;
-      model.refreshCacheNames();
-    }
+    if (this._swCacheModel)
+      this._swCacheModel.refreshCacheNames();
   }
 
   /**
@@ -1180,7 +1036,7 @@ Resources.ClearStorageTreeElement = class extends Resources.BaseStorageTreeEleme
   onselect(selectedByUser) {
     super.onselect(selectedByUser);
     if (!this._view)
-      this._view = new Resources.ClearStorageView(this._storagePanel);
+      this._view = new Resources.ClearStorageView();
     this.showView(this._view);
     return false;
   }
@@ -1604,6 +1460,10 @@ Resources.IDBIndexTreeElement = class extends Resources.BaseStorageTreeElement {
  * @unrestricted
  */
 Resources.DOMStorageTreeElement = class extends Resources.BaseStorageTreeElement {
+  /**
+   * @param {!Resources.ResourcesPanel} storagePanel
+   * @param {!Resources.DOMStorage} domStorage
+   */
   constructor(storagePanel, domStorage) {
     super(storagePanel, domStorage.securityOrigin ? domStorage.securityOrigin : Common.UIString('Local Files'), false);
     this._domStorage = domStorage;
@@ -1622,7 +1482,7 @@ Resources.DOMStorageTreeElement = class extends Resources.BaseStorageTreeElement
    */
   onselect(selectedByUser) {
     super.onselect(selectedByUser);
-    this._storagePanel._showDOMStorage(this._domStorage);
+    this._storagePanel.showDOMStorage(this._domStorage);
     return false;
   }
 
@@ -1673,7 +1533,7 @@ Resources.CookieTreeElement = class extends Resources.BaseStorageTreeElement {
   _handleContextMenuEvent(event) {
     var contextMenu = new UI.ContextMenu(event);
     contextMenu.appendItem(
-        Common.UIString('Clear'), () => this._storagePanel._clearCookies(this._target, this._cookieDomain));
+        Common.UIString('Clear'), () => this._storagePanel.clearCookies(this._target, this._cookieDomain));
     contextMenu.show();
   }
 
@@ -1683,7 +1543,7 @@ Resources.CookieTreeElement = class extends Resources.BaseStorageTreeElement {
    */
   onselect(selectedByUser) {
     super.onselect(selectedByUser);
-    this._storagePanel.showCookies(this, this._cookieDomain, this._target);
+    this._storagePanel.showCookies(this._target, this._cookieDomain);
     return false;
   }
 };
@@ -1723,15 +1583,16 @@ Resources.ApplicationCacheManifestTreeElement = class extends Resources.BaseStor
  */
 Resources.ApplicationCacheFrameTreeElement = class extends Resources.BaseStorageTreeElement {
   /**
-   * @param {!Resources.ResourcesPanel} storagePanel
-   * @param {!Protocol.Page.FrameId} frameId
+   * @param {!Resources.ApplicationPanelSidebar} sidebar
+   * @param {!SDK.ResourceTreeFrame} frame
    * @param {string} manifestURL
    */
-  constructor(storagePanel, frameId, manifestURL) {
-    super(storagePanel, '', false);
-    this._frameId = frameId;
+  constructor(sidebar, frame, manifestURL) {
+    super(sidebar._panel, '', false);
+    this._sidebar = sidebar;
+    this._frameId = frame.id;
     this._manifestURL = manifestURL;
-    this._refreshTitles();
+    this._refreshTitles(frame);
 
     var icon = UI.Icon.create('largeicon-navigator-folder', 'navigator-tree-item');
     icon.classList.add('navigator-folder-tree-item');
@@ -1750,14 +1611,18 @@ Resources.ApplicationCacheFrameTreeElement = class extends Resources.BaseStorage
     return this._manifestURL;
   }
 
-  _refreshTitles() {
-    var resourceTreeModel = SDK.ResourceTreeModel.fromTarget(this._storagePanel._target);
-    var frame = resourceTreeModel.frameForId(this._frameId);
+  /**
+   * @param {!SDK.ResourceTreeFrame} frame
+   */
+  _refreshTitles(frame) {
     this.title = frame.displayName();
   }
 
-  frameNavigated() {
-    this._refreshTitles();
+  /**
+   * @param {!SDK.ResourceTreeFrame} frame
+   */
+  frameNavigated(frame) {
+    this._refreshTitles(frame);
   }
 
   /**
@@ -1766,7 +1631,7 @@ Resources.ApplicationCacheFrameTreeElement = class extends Resources.BaseStorage
    */
   onselect(selectedByUser) {
     super.onselect(selectedByUser);
-    this._storagePanel.showApplicationCache(this._frameId);
+    this._sidebar._showApplicationCache(this._frameId);
     return false;
   }
 };