Merge to 2883 "[DevTools] Support top/bottom show sidebar button."

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 62 matching lines @@
     tabbedPane.rightToolbar().appendToolbarItem(navigatorMenuButton);
     this.editorView.setSidebarWidget(tabbedPane);
 
     this._sourcesView = new WebInspector.SourcesView();
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorSelected, this._editorSelected.bind(this));
     this._sourcesView.addEventListener(WebInspector.SourcesView.Events.EditorClosed, this._editorClosed.bind(this));
     this._sourcesView.registerShortcuts(this.registerShortcuts.bind(this));
 
     this._toggleNavigatorSidebarButton = this.editorView.createShowHideSidebarButton("navigator");
     this._toggleDebuggerSidebarButton = this._splitWidget.createShowHideSidebarButton("debugger");
-    this._showSourcesViewInPanel();
+    this.editorView.setMainWidget(this._sourcesView);
     this._editorChanged(this._sourcesView.currentUISourceCode());
 
     this._threadsSidebarPane = null;
     this._watchSidebarPane = /** @type {!WebInspector.View} */ (WebInspector.viewManager.view("sources.watch"));
     // TODO: Force installing listeners from the model, not the UI.
     self.runtime.sharedInstance(WebInspector.XHRBreakpointsSidebarPane);
     this._callstackPane = self.runtime.sharedInstance(WebInspector.CallStackSidebarPane);
     this._callstackPane.registerShortcuts(this.registerShortcuts.bind(this));
 
     WebInspector.moduleSetting("sidebarPosition").addChangeListener(this._updateSidebarPosition.bind(this));
@@ skipping 83 matching lines @@
         return this._paused;
     },
 
     wasShown: function()
     {
         WebInspector.context.setFlavor(WebInspector.SourcesPanel, this);
         WebInspector.Panel.prototype.wasShown.call(this);
         var wrapper = WebInspector.SourcesPanel.WrapperView._instance;
         if (wrapper && wrapper.isShowing()) {
             WebInspector.inspectorView.setDrawerMinimized(true);
-            WebInspector.SourcesPanel.updateResizer(this);
+            WebInspector.SourcesPanel.updateResizerAndSidebarButtons(this);
         }
-        this._showSourcesViewInPanel();
+        this.editorView.setMainWidget(this._sourcesView);
     },
 
     willHide: function()
     {
         WebInspector.Panel.prototype.willHide.call(this);
         WebInspector.context.setFlavor(WebInspector.SourcesPanel, null);
         if (WebInspector.SourcesPanel.WrapperView.isShowing()) {
             WebInspector.SourcesPanel.WrapperView._instance._showViewInWrapper();
             WebInspector.inspectorView.setDrawerMinimized(false);
-            WebInspector.SourcesPanel.updateResizer(this);
+            WebInspector.SourcesPanel.updateResizerAndSidebarButtons(this);
         }
     },
 
-    _showSourcesViewInPanel: function()
-    {
-        this._sourcesView.leftToolbar().removeToolbarItems();
-        this._sourcesView.leftToolbar().appendToolbarItem(this._toggleNavigatorSidebarButton);
-        this._sourcesView.rightToolbar().removeToolbarItems();
-        this._sourcesView.rightToolbar().appendToolbarItem(this._toggleDebuggerSidebarButton);
-        this.editorView.setMainWidget(this._sourcesView);
-    },
-
     /**
      * @override
      * @param {string} locationName
      * @return {?WebInspector.ViewLocation}
      */
     resolveLocation: function(locationName)
     {
         if (locationName === "sources-sidebar")
             return this._sidebarPaneStack;
         else
@@ skipping 823 matching lines @@
 
         if (this.sidebarPaneView && this.sidebarPaneView.shouldHideOnDetach())
             return; // We can't reparent extension iframes.
 
         if (this.sidebarPaneView)
             this.sidebarPaneView.detach();
 
         this._splitWidget.setVertical(!vertically);
         this._splitWidget.element.classList.toggle("sources-split-view-vertical", vertically);
 
-        WebInspector.SourcesPanel.updateResizer(this);
+        WebInspector.SourcesPanel.updateResizerAndSidebarButtons(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 = WebInspector.viewManager.createStackLocation(this._revealDebuggerSidebar.bind(this));
         this._sidebarPaneStack.widget().element.classList.add("overflow-auto");
         this._sidebarPaneStack.widget().show(vbox.element);
         vbox.element.appendChild(this._debugToolbar.element);
 
@@ skipping 266 matching lines @@
 WebInspector.SourcesPanel.instance = function()
 {
     if (WebInspector.SourcesPanel._instance)
         return WebInspector.SourcesPanel._instance;
     return /** @type {!WebInspector.SourcesPanel} */ (self.runtime.sharedInstance(WebInspector.SourcesPanel));
 }
 
 /**
  * @param {!WebInspector.SourcesPanel} panel
  */
-WebInspector.SourcesPanel.updateResizer = function(panel)
+WebInspector.SourcesPanel.updateResizerAndSidebarButtons = function(panel)
 {
-    if (panel._splitWidget.isVertical() || (WebInspector.SourcesPanel.WrapperView.isShowing() && !WebInspector.inspectorView.isDrawerMinimized()))
+    panel._sourcesView.leftToolbar().removeToolbarItems();
+    panel._sourcesView.rightToolbar().removeToolbarItems();
+    panel._sourcesView.bottomToolbar().removeToolbarItems();
+    var isInWrapper = WebInspector.SourcesPanel.WrapperView.isShowing() && !WebInspector.inspectorView.isDrawerMinimized();
+    if (panel._splitWidget.isVertical() || isInWrapper)
         panel._splitWidget.uninstallResizer(panel._sourcesView.toolbarContainerElement());
     else
         panel._splitWidget.installResizer(panel._sourcesView.toolbarContainerElement());
+    if (!isInWrapper) {
+        panel._sourcesView.leftToolbar().appendToolbarItem(panel._toggleNavigatorSidebarButton);
+        if (panel._splitWidget.isVertical())
+            panel._sourcesView.rightToolbar().appendToolbarItem(panel._toggleDebuggerSidebarButton);
+        else
+            panel._sourcesView.bottomToolbar().appendToolbarItem(panel._toggleDebuggerSidebarButton);
+    }
 }
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  */
 WebInspector.SourcesPanel.WrapperView = function()
 {
     WebInspector.VBox.call(this);
     this.element.classList.add("sources-view-wrapper");
     WebInspector.SourcesPanel.WrapperView._instance = this;
     this._view = WebInspector.SourcesPanel.instance()._sourcesView;
 }
 
 WebInspector.SourcesPanel.WrapperView.prototype = {
     wasShown: function()
     {
         if (WebInspector.inspectorView.currentPanel() && WebInspector.inspectorView.currentPanel().name !== "sources")
             this._showViewInWrapper();
         else
             WebInspector.inspectorView.setDrawerMinimized(true);
-        WebInspector.SourcesPanel.updateResizer(WebInspector.SourcesPanel.instance());
+        WebInspector.SourcesPanel.updateResizerAndSidebarButtons(WebInspector.SourcesPanel.instance());
     },
 
     willHide: function()
     {
         WebInspector.inspectorView.setDrawerMinimized(false);
-        setImmediate(() => WebInspector.SourcesPanel.updateResizer(WebInspector.SourcesPanel.instance()));
+        setImmediate(() => WebInspector.SourcesPanel.updateResizerAndSidebarButtons(WebInspector.SourcesPanel.instance()));
     },
 
     _showViewInWrapper: function()
     {
-        this._view.leftToolbar().removeToolbarItems();
-        this._view.rightToolbar().removeToolbarItems();
         this._view.show(this.element);
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @return {boolean}
  */
 WebInspector.SourcesPanel.WrapperView.isShowing = function()
 {
     return !!WebInspector.SourcesPanel.WrapperView._instance && WebInspector.SourcesPanel.WrapperView._instance.isShowing();
 }