[DevTools] Rework some focus code.

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 29 matching lines @@
     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._drawerTabbedLocation = WebInspector.viewManager.createTabbedLocation(this.showDrawer.bind(this), "drawer-view", true);
+    this._drawerTabbedLocation = WebInspector.viewManager.createTabbedLocation(this._showDrawer.bind(this, false), "drawer-view", true);
     this._drawerTabbedLocation.enableMoreTabsButton();
     this._drawerTabbedPane = this._drawerTabbedLocation.tabbedPane();
     this._drawerTabbedPane.setMinimumSize(0, 27);
     var closeDrawerButton = new WebInspector.ToolbarButton(WebInspector.UIString("Close drawer"), "delete-toolbar-item");
-    closeDrawerButton.addEventListener("click", this.closeDrawer.bind(this));
+    closeDrawerButton.addEventListener("click", this._closeDrawer.bind(this));
     this._drawerTabbedPane.rightToolbar().appendToolbarItem(closeDrawerButton);
     this._drawerSplitWidget.installResizer(this._drawerTabbedPane.headerElement());
     this._drawerSplitWidget.setSidebarWidget(this._drawerTabbedPane);
 
     // Create main area tabbed pane.
     this._tabbedPane = new WebInspector.TabbedPane();
     this._tabbedPane.registerRequiredCSS("ui/inspectorViewTabbedPane.css");
     this._tabbedPane.setTabSlider(true);
     this._tabbedPane.setAllowTabReorder(true, false);
     this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabOrderChanged, this._persistPanelOrder, this);
@@ skipping 290 matching lines @@
         this._tabbedPane.addEventListener(WebInspector.TabbedPane.Events.TabSelected, this._tabSelected, this);
 
         this._lastActivePanelSetting.set(panel.name);
         this._pushToHistory(panel.name);
         WebInspector.userMetrics.panelShown(panel.name);
         panel.focus();
 
         return panel;
     },
 
-    showDrawer: function()
+    /**
+     * @param {boolean} focus
+     */
+    _showDrawer: function(focus)
     {
-        if (!this._drawerTabbedPane.isShowing())
-            this._drawerSplitWidget.showBoth();
-        this._drawerTabbedPane.focus();
+        if (this._drawerTabbedPane.isShowing())
+            return;
+        this._drawerSplitWidget.showBoth();
+        if (focus)
+            this._focusRestorer = new WebInspector.WidgetFocusRestorer(this._drawerTabbedPane);
+        else
+            this._focusRestorer = null;
     },
 
     /**
      * @return {boolean}
      */
     drawerVisible: function()
     {
         return this._drawerTabbedPane.isShowing();
     },
 
-    closeDrawer: function()
+    _closeDrawer: function()
     {
         if (!this._drawerTabbedPane.isShowing())
             return;
-        WebInspector.restoreFocusFromElement(this._drawerTabbedPane.element);
+        if (this._focusRestorer)
+            this._focusRestorer.restore();
         this._drawerSplitWidget.hideSidebar(true);
     },
 
     /**
      * @param {boolean} minimized
      */
     setDrawerMinimized: function(minimized)
     {
         this._drawerSplitWidget.setSidebarMinimized(minimized);
         this._drawerSplitWidget.setResizable(!minimized);
@@ skipping 189 matching lines @@
 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();
+            WebInspector.inspectorView._closeDrawer();
         else
-            WebInspector.inspectorView.showDrawer();
+            WebInspector.inspectorView._showDrawer(true);
         return true;
     }
 }