DevTools: introduce view locations, allow opening views by id.

third_party/WebKit/Source/devtools/front_end/ui/InspectorView.js

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
+ * @implements {WebInspector.ViewLocationResolver}
  */
 WebInspector.InspectorView = function()
 {
     WebInspector.VBox.call(this);
     WebInspector.Dialog.setModalHostView(this);
     this.setMinimumSize(240, 72);
 
     // DevTools sidebar is a vertical split of panels tabbed pane and a drawer.
     this._drawerSplitWidget = new WebInspector.SplitWidget(false, true, "Inspector.drawerSplitViewState", 200, 200);
     this._drawerSplitWidget.hideSidebar();
+    this._drawerSplitWidget.hideDefaultResizer();
     this._drawerSplitWidget.enableShowModeSaving();
     this._drawerSplitWidget.show(this.element);
 
+    // Create drawer tabbed pane.
+    this._drawerTabbedPane = new WebInspector.ExtensibleTabbedPane("drawer-view", true);
+    this._drawerTabbedPane.setMinimumSize(0, 27);
+    this._drawerTabbedPane.enableMoreTabsButton();
+    var drawerToolbar = new WebInspector.Toolbar("drawer-close-toolbar");
+    var closeDrawerButton = new WebInspector.ToolbarButton(WebInspector.UIString("Close drawer"), "delete-toolbar-item");
+    closeDrawerButton.addEventListener("click", this.closeDrawer.bind(this));
+    drawerToolbar.appendToolbarItem(closeDrawerButton);
+    this._drawerTabbedPane.tabbedPane().appendAfterTabStrip(drawerToolbar.element);
+    this._drawerSplitWidget.installResizer(this._drawerTabbedPane.tabbedPane().headerElement());
+    this._drawerSplitWidget.setSidebarWidget(this._drawerTabbedPane);
+
+    // Create main area tabbed pane.
     this._tabbedPane = new WebInspector.TabbedPane();
     this._tabbedPane.registerRequiredCSS("ui/inspectorViewTabbedPane.css");
     this._tabbedPane.element.classList.add("inspector-view-tabbed-pane");
     this._tabbedPane.setTabSlider(true);
     this._tabbedPane.setAllowTabReorder(true, false);
     this._tabbedPane.addEventListener(WebInspector.TabbedPane.EventTypes.TabOrderChanged, this._persistPanelOrder, this);
     this._tabOrderSetting = WebInspector.settings.createSetting("InspectorView.panelOrder", {});
     this._drawerSplitWidget.setMainWidget(this._tabbedPane);
-    this._drawer = new WebInspector.Drawer(this._drawerSplitWidget);
 
     this._panels = {};
     // Used by tests.
     WebInspector["panels"] = this._panels;
 
     this._history = [];
     this._historyIterator = -1;
     this._keyDownBound = this._keyDown.bind(this);
     this._keyPressBound = this._keyPress.bind(this);
     /** @type {!Object.<string, !WebInspector.PanelDescriptor>} */
     this._panelDescriptors = {};
     /** @type {!Object.<string, !Promise.<!WebInspector.Panel> >} */
     this._panelPromises = {};
 
     this._lastActivePanelSetting = WebInspector.settings.createSetting("lastActivePanel", "elements");
 
     InspectorFrontendHost.events.addEventListener(InspectorFrontendHostAPI.Events.ShowPanel, showPanel.bind(this));
     this._loadPanelDesciptors();
 
     /**
      * @this {WebInspector.InspectorView}
      * @param {!WebInspector.Event} event
      */
     function showPanel(event)
     {
         var panelName = /** @type {string} */ (event.data);
         this.showPanel(panelName);
     }
-};
+}
+
+/**
+ * @return {!WebInspector.InspectorView}
+ */
+WebInspector.InspectorView.instance = function()
+{
+    return /** @type {!WebInspector.InspectorView} */ (self.runtime.sharedInstance(WebInspector.InspectorView));
+}
 
 WebInspector.InspectorView.prototype = {
     wasShown: function()
     {
         this.element.ownerDocument.addEventListener("keydown", this._keyDownBound, false);
         this.element.ownerDocument.addEventListener("keypress", this._keyPressBound, false);
     },
 
     willHide: function()
     {
         this.element.ownerDocument.removeEventListener("keydown", this._keyDownBound, false);
         this.element.ownerDocument.removeEventListener("keypress", this._keyPressBound, false);
     },
 
+    /**
+     * @override
+     * @param {string} locationName
+     * @return {?WebInspector.ViewLocation}
+     */
+    resolveLocation: function(locationName)
+    {
+        this.showDrawer();
+        return this._drawerTabbedPane;
+    },
+
     _loadPanelDesciptors: function()
     {
         /**
          * @param {!Runtime.Extension} extension
          * @this {!WebInspector.InspectorView}
          */
         function processPanelExtensions(extension)
         {
             var descriptor = new WebInspector.ExtensionPanelDescriptor(extension);
             var weight = this._tabOrderSetting.get()[descriptor.name()];
@@ skipping 230 matching lines @@
         this._lastActivePanelSetting.set(panel.name);
         this._pushToHistory(panel.name);
         WebInspector.userMetrics.panelShown(panel.name);
         panel.focus();
 
         return panel;
     },
 
     showDrawer: function()
     {
-        this._drawer.showDrawer();
+        if (!this._drawerTabbedPane.isShowing())
+            this._drawerSplitWidget.showBoth();
+        this._drawerTabbedPane.focus();
     },
 
     /**
      * @return {boolean}
      */
     drawerVisible: function()
     {
-        return this._drawer.isShowing();
-    },
-
-    /**
-     * @param {string} id
-     * @param {boolean=} immediate
-     */
-    showViewInDrawer: function(id, immediate)
-    {
-        this._drawer.showView(id, immediate);
+        return this._drawerTabbedPane.isShowing();
     },
 
     closeDrawer: function()
     {
-        this._drawer.closeDrawer();
+        if (!this._drawerTabbedPane.isShowing())
+            return;
+        WebInspector.restoreFocusFromElement(this._drawerTabbedPane.element);
+        this._drawerSplitWidget.hideSidebar(true);
     },
 
     /**
      * @param {boolean} minimized
      */
     setDrawerMinimized: function(minimized)
     {
         this._drawerSplitWidget.setSidebarMinimized(minimized);
         this._drawerSplitWidget.setResizable(!minimized);
     },
@@ skipping 168 matching lines @@
         if (this._ownerSplitWidget)
             this._ownerSplitWidget.setSidebarMinimized(false);
     },
 
     __proto__: WebInspector.VBox.prototype
 };
 
 /**
  * @type {!WebInspector.InspectorView}
  */
 WebInspector.inspectorView;

[dgozman, 2016/08/03 19:18:18]

Remove this one. And you can move this to the "main" module in next patch!

[pfeldman, 2016/08/03 21:52:18]

Wat?

 
 /**
  * @constructor
  * @implements {WebInspector.ActionDelegate}
  */
 WebInspector.InspectorView.DrawerToggleActionDelegate = function()
 {
 }
 
 WebInspector.InspectorView.DrawerToggleActionDelegate.prototype = {
     /**
      * @override
      * @param {!WebInspector.Context} context
      * @param {string} actionId
      * @return {boolean}
      */
     handleAction: function(context, actionId)
     {
         if (WebInspector.inspectorView.drawerVisible())
             WebInspector.inspectorView.closeDrawer();
         else
             WebInspector.inspectorView.showDrawer();
         return true;
     }
 }