[DevTools] Rework some focus code.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @interface
  */
 WebInspector.View = function()
 {
 }
@@ skipping 417 matching lines @@
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @param {!WebInspector.View} view
  */
 WebInspector.ViewManager._ContainerWidget = function(view)
 {
     WebInspector.VBox.call(this);
     this.element.classList.add("flex-auto", "view-container", "overflow-auto");
     this._view = view;
+    this.element.tabIndex = 0;
+    this.setDefaultFocusedElement(this.element);
 }
 
 WebInspector.ViewManager._ContainerWidget.prototype = {
     /**
      * @return {!Promise}
      */
     _materialize: function()
     {
         if (this._materializePromise)
             return this._materializePromise;
         var promises = [];
         promises.push(this._view.toolbarItems().then(WebInspector.ViewManager._populateToolbar.bind(WebInspector.ViewManager, this.element)));
-        promises.push(this._view.widget().then(widget => widget.show(this.element)));
+        promises.push(this._view.widget().then(widget => {
+            // Move focus from |this| to loaded |widget| if any.
+            var shouldFocus = this.element.hasFocus();
+            this.setDefaultFocusedElement(null);
+            widget.show(this.element);
+            if (shouldFocus)
+                widget.focus();
+        }));
         this._materializePromise = Promise.all(promises);
         return this._materializePromise;
     },
 
     __proto__: WebInspector.VBox.prototype
 }
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
@@ skipping 228 matching lines @@
 
     /**
      * @override
      * @param {!WebInspector.View} view
      * @param {?WebInspector.View=} insertBefore
      * @return {!Promise}
      */
     showView: function(view, insertBefore)
     {
         this.appendView(view, insertBefore);
+        this._tabbedPane.selectTab(view.viewId());
         this._tabbedPane.focus();
-        this._tabbedPane.selectTab(view.viewId());
         return this._materializeWidget(view);
     },
 
     /**
      * @param {!WebInspector.View} view
      * @override
      */
     removeView: function(view)
     {
         if (!this._tabbedPane.hasTab(view.viewId()))
@@ skipping 138 matching lines @@
             this.appendView(view);
     },
 
     __proto__: WebInspector.ViewManager._Location.prototype
 }
 
 /**
  * @type {!WebInspector.ViewManager}
  */
 WebInspector.viewManager;