DevTools: application panel should restore previous pane

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

 /*
  * Copyright (C) 2007, 2008, 2010 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  * Copyright (C) 2013 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 98 matching lines @@
     _addSidebarSection: function(title)
     {
         var treeElement = new TreeElement(title, true);
         treeElement.listItemElement.classList.add("storage-group-list-item");
         treeElement.setCollapsible(false);
         treeElement.selectable = false;
         this._sidebarTree.appendChild(treeElement);
         return treeElement;
     },
 
-    wasShown: function()
-    {
-        if (!this._sidebarTree.selectedTreeElement)
-            this._manifestTreeElement.select();
-    },
-
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         if (this._target)
             return;
         this._target = target;
         this._databaseModel = WebInspector.DatabaseModel.fromTarget(target);
         this._domStorageModel = WebInspector.DOMStorageModel.fromTarget(target);
 
         if (target.resourceTreeModel.cachedResourcesLoaded())
             this._initialize();
 
-        target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
         target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
         target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetWithFrames, this);
         this._databaseModel.addEventListener(WebInspector.DatabaseModel.Events.DatabaseAdded, this._databaseAdded, this);
         this._databaseModel.addEventListener(WebInspector.DatabaseModel.Events.DatabasesRemoved, this._resetWebSQL, this);
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
         if (target !== this._target)
             return;
         delete this._target;
 
-        target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.Load, this._loadEventFired, this);
         target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._initialize, this);
         target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.WillLoadCachedResources, this._resetWithFrames, this);
         this._databaseModel.removeEventListener(WebInspector.DatabaseModel.Events.DatabaseAdded, this._databaseAdded, this);
         this._databaseModel.removeEventListener(WebInspector.DatabaseModel.Events.DatabasesRemoved, this._resetWebSQL, this);
 
         this._resetWithFrames();
     },
 
     _initialize: function()
     {
         this._databaseModel.enable();
         this._domStorageModel.enable();
         var indexedDBModel = WebInspector.IndexedDBModel.fromTarget(this._target);
         if (indexedDBModel)
             indexedDBModel.enable();
 
         var cacheStorageModel = WebInspector.ServiceWorkerCacheModel.fromTarget(this._target);
         if (cacheStorageModel)
             cacheStorageModel.enable();
 
         if (this._target.isPage())
             this._populateResourceTree();
         this._populateDOMStorageTree();
         this._populateApplicationCacheTree();
         this.indexedDBListTreeElement._initialize();
         this.cacheStorageListTreeElement._initialize();
         this._initDefaultSelection();
-        this._initialized = true;
-    },
-
-    _loadEventFired: function()
-    {
-        this._initDefaultSelection();
     },
 
     _initDefaultSelection: function()
     {
-        if (!this._initialized)
-            return;
-
         var itemURL = this._resourcesLastSelectedItemSetting.get();
         if (itemURL) {
             var rootElement = this._sidebarTree.rootElement();
             for (var treeElement = rootElement.firstChild(); treeElement; treeElement = treeElement.traverseNextTreeElement(false, rootElement, true)) {
                 if (treeElement.itemURL === itemURL) {
                     treeElement.revealAndSelect(true);
                     return;
                 }
             }
         }
-
-        var mainResource = this._target.resourceTreeModel.inspectedPageURL() && this.resourcesListTreeElement && this.resourcesListTreeElement.expanded
-                ? this._target.resourceTreeModel.resourceForURL(this._target.resourceTreeModel.inspectedPageURL())
-                : null;
-        if (mainResource)
-            this.showResource(mainResource);
+        this._manifestTreeElement.select();
     },
 
     _resetWithFrames: function()
     {
         this.resourcesListTreeElement.removeChildren();
         this._treeElementForFrameId = {};
         this._reset();
     },
 
     _resetWebSQL: function()
@@ skipping 2012 matching lines @@
 WebInspector.ResourcesPanelFactory.prototype = {
     /**
      * @override
      * @return {!WebInspector.Panel}
      */
     createPanel: function()
     {
         return WebInspector.ResourcesPanel._instance();
     }
 }