DevTools: use view locations in the elements and sources sidebars.

third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 Google Inc. 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 46 matching lines @@
     this._splitWidget.show(this.element);
 
     // Create scripts navigator
     const initialNavigatorWidth = 225;
     this.editorView = new WebInspector.SplitWidget(true, false, "sourcesPanelNavigatorSplitViewState", initialNavigatorWidth);
     this.editorView.enableShowModeSaving();
     this.editorView.element.tabIndex = 0;
     this._splitWidget.setMainWidget(this.editorView);
 
     // Create navigator tabbed pane with toolbar.
-    this._navigatorTabbedLocation = WebInspector.viewManager.createTabbedLocation("navigator-view", true);
+    this._navigatorTabbedLocation = WebInspector.viewManager.createTabbedLocation(this._setAsCurrentPanel.bind(this), "navigator-view", true);
     var tabbedPane = this._navigatorTabbedLocation.tabbedPane();
     tabbedPane.setMinimumSize(100, 25);
     tabbedPane.setShrinkableTabs(true);
     tabbedPane.element.classList.add("navigator-tabbed-pane");
     var navigatorToolbar = new WebInspector.Toolbar("");
     var navigatorMenuButton = new WebInspector.ToolbarMenuButton(this._populateNavigatorMenu.bind(this), true);
     navigatorMenuButton.setTitle(WebInspector.UIString("More options"));
     navigatorToolbar.appendToolbarItem(navigatorMenuButton);
     tabbedPane.appendAfterTabStrip(navigatorToolbar.element);
     this.editorView.setSidebarWidget(tabbedPane);
@@ skipping 11 matching lines @@
     this.sidebarPanes.callstack.addEventListener(WebInspector.CallStackSidebarPane.Events.CallFrameSelected, this._callFrameSelectedInSidebar.bind(this));
     this.sidebarPanes.callstack.registerShortcuts(this.registerShortcuts.bind(this));
 
     this.sidebarPanes.scopechain = new WebInspector.ScopeChainSidebarPane();
     this.sidebarPanes.jsBreakpoints = new WebInspector.JavaScriptBreakpointsSidebarPane(WebInspector.breakpointManager, this.showUISourceCode.bind(this));
     this.sidebarPanes.domBreakpoints = WebInspector.domBreakpointsSidebarPane.createProxy(this);
     this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
     this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
     this.sidebarPanes.objectEventListeners = new WebInspector.ObjectEventListenersSidebarPane();
 
-    this._lastSelectedTabSetting = WebInspector.settings.createLocalSetting("lastSelectedSourcesSidebarPaneTab", WebInspector.UIString("Scope"));
-
     this._installDebuggerSidebarController();
 
     WebInspector.moduleSetting("sidebarPosition").addChangeListener(this._updateSidebarPosition.bind(this));
     this._updateSidebarPosition();
 
     this._updateDebuggerButtons();
     this._pauseOnExceptionEnabledChanged();
     WebInspector.moduleSetting("pauseOnExceptionEnabled").addChangeListener(this._pauseOnExceptionEnabledChanged, this);
 
     this._liveLocationPool = new WebInspector.LiveLocationPool();
@@ skipping 21 matching lines @@
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
         var hasThreads = WebInspector.targetManager.targets(WebInspector.Target.Capability.JS).length > 1;
         if (hasThreads && !this.sidebarPanes.threads) {
             this.sidebarPanes.threads = new WebInspector.ThreadsSidebarPane();
             if (this._sidebarPaneStack) {
-                this._sidebarPaneStack.insertViewBefore(this.sidebarPanes.threads, this._splitWidget.isVertical() ? this.sidebarPanes.watchExpressions : this.sidebarPanes.callstack, true);
+                this._sidebarPaneStack.showView(this.sidebarPanes.threads, this._splitWidget.isVertical() ? this.sidebarPanes.watchExpressions : this.sidebarPanes.callstack);
             }
         }
     },
 
     /**
      * @override
      * @param {!WebInspector.Target} target
      */
     targetRemoved: function(target)
     {
@@ skipping 59 matching lines @@
             WebInspector.inspectorView.setDrawerMinimized(false);
             WebInspector.SourcesPanel.updateResizer(this);
         }
     },
 
     /**
      * @override
      * @param {string} locationName
      * @return {?WebInspector.ViewLocation}
      */
-    revealLocation: function(locationName)
+    resolveLocation: function(locationName)
     {
-        WebInspector.inspectorView.setCurrentPanel(WebInspector.SourcesPanel.instance());
         return this._navigatorTabbedLocation;
     },
 
     /**
      * @return {boolean}
      */
     _ensureSourcesViewVisible: function()
     {
         if (WebInspector.SourcesPanel.WrapperView.isShowing())
             return true;
@@ skipping 883 matching lines @@
 
         this._splitWidget.setVertical(!vertically);
         this._splitWidget.element.classList.toggle("sources-split-view-vertical", vertically);
 
         WebInspector.SourcesPanel.updateResizer(this);
 
         // Create vertical box with stack.
         var vbox = new WebInspector.VBox();
         vbox.element.appendChild(this._debugToolbarDrawer);
         vbox.setMinimumAndPreferredSizes(25, 25, WebInspector.SourcesPanel.minToolbarWidth, 100);
-        this._sidebarPaneStack = new WebInspector.View.ExpandableStackContainer();
-        this._sidebarPaneStack.show(vbox.element);
+        this._sidebarPaneStack = WebInspector.viewManager.createStackLocation(this._setAsCurrentPanel.bind(this), "sources-sidebar");
+        this._sidebarPaneStack.widget().show(vbox.element);
         vbox.element.appendChild(this._debugToolbar.element);
 
+        if (this.sidebarPanes.threads)
+            this._sidebarPaneStack.showView(this.sidebarPanes.threads);
+
         if (!vertically) {
-            // Populate the only stack.
+            if (this.sidebarPanes.watchExpressions.hasExpressions())
+                this._sidebarPaneStack.showView(this.sidebarPanes.watchExpressions);
+            else
+                this._sidebarPaneStack.appendView(this.sidebarPanes.watchExpressions);
+        }
+
+        this._sidebarPaneStack.showView(this.sidebarPanes.callstack);
+        this._sidebarPaneStack.showView(this.sidebarPanes.scopechain);
+        this._sidebarPaneStack.showView(this.sidebarPanes.jsBreakpoints);
+
+        if (!vertically) {
+            // Populate the rest of the stack.
             for (var pane in this.sidebarPanes) {
                 if (this.sidebarPanes[pane])
                     this._sidebarPaneStack.appendView(this.sidebarPanes[pane]);
             }
             this._extensionSidebarPanesContainer = this._sidebarPaneStack;
             this.sidebarPaneView = vbox;
-
-            this.sidebarPanes.scopechain.revealWidget();
-            this.sidebarPanes.watchExpressions.expandIfNecessary();
         } else {
             var splitWidget = new WebInspector.SplitWidget(true, true, "sourcesPanelDebuggerSidebarSplitViewState", 0.5);
             splitWidget.setMainWidget(vbox);
 
             // Populate the left stack.
-            if (this.sidebarPanes.threads)
-                this._sidebarPaneStack.appendView(this.sidebarPanes.threads);
-            this._sidebarPaneStack.appendView(this.sidebarPanes.callstack);
-            this._sidebarPaneStack.appendView(this.sidebarPanes.jsBreakpoints);
             this._sidebarPaneStack.appendView(this.sidebarPanes.domBreakpoints);
             this._sidebarPaneStack.appendView(this.sidebarPanes.xhrBreakpoints);
             this._sidebarPaneStack.appendView(this.sidebarPanes.eventListenerBreakpoints);
             this._sidebarPaneStack.appendView(this.sidebarPanes.objectEventListeners);
 
-            var tabbedPane = new WebInspector.View.TabbedPaneContainer();
-            splitWidget.setSidebarWidget(tabbedPane);
-            tabbedPane.appendView(this.sidebarPanes.scopechain);
-            tabbedPane.appendView(this.sidebarPanes.watchExpressions);
-            if (this.sidebarPanes.serviceWorkers)
-                tabbedPane.appendView(this.sidebarPanes.serviceWorkers);
-            tabbedPane.selectTab(this._lastSelectedTabSetting.get());
-            tabbedPane.addEventListener(WebInspector.TabbedPane.EventTypes.TabSelected, this._tabSelected, this);
-            this._extensionSidebarPanesContainer = tabbedPane;
+            var tabbedLocation = WebInspector.viewManager.createTabbedLocation(this._setAsCurrentPanel.bind(this), "sources-sidebar-tabs");
+            splitWidget.setSidebarWidget(tabbedLocation.tabbedPane());
+            tabbedLocation.appendView(this.sidebarPanes.scopechain);
+            tabbedLocation.appendView(this.sidebarPanes.watchExpressions);
+            this._extensionSidebarPanesContainer = tabbedLocation;
             this.sidebarPaneView = splitWidget;
         }
 
         var extensionSidebarPanes = WebInspector.extensionServer.sidebarPanes();
         for (var i = 0; i < extensionSidebarPanes.length; ++i)
             this._addExtensionSidebarPane(extensionSidebarPanes[i]);
 
         this._splitWidget.setSidebarWidget(this.sidebarPaneView);
-        if (this.sidebarPanes.threads)
-            this.sidebarPanes.threads.revealWidget();
-        this.sidebarPanes.jsBreakpoints.revealWidget();
-        this.sidebarPanes.callstack.revealWidget();
+    },
+
+    _setAsCurrentPanel: function()
+    {
+        WebInspector.inspectorView.setCurrentPanel(this);
     },
 
     /**
-     * @param {!WebInspector.Event} event
-     */
-    _tabSelected: function(event)
-    {
-        this._lastSelectedTabSetting.set(event.data.tabId);
-    },
-
-    /**
      * @param {!WebInspector.Event} event
      */
     _extensionSidebarPaneAdded: function(event)
     {
         var pane = /** @type {!WebInspector.ExtensionSidebarPane} */ (event.data);
         this._addExtensionSidebarPane(pane);
     },
 
     /**
      * @param {!WebInspector.ExtensionSidebarPane} pane
@@ skipping 274 matching lines @@
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @return {boolean}
  */
 WebInspector.SourcesPanel.WrapperView.isShowing = function()
 {
     return !!WebInspector.SourcesPanel.WrapperView._instance && WebInspector.SourcesPanel.WrapperView._instance.isShowing();
 }