[DevTools] Rework some focus code.

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

 /*
  * Copyright (C) 2010 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 135 matching lines @@
     },
 
     /**
      * @param {boolean} closeableTabs
      */
     setCloseableTabs: function(closeableTabs)
     {
         this._closeableTabs = closeableTabs;
     },
 
+    /**
+     * @override
+     */
     focus: function()
     {
         if (this.visibleView)
             this.visibleView.focus();
         else
             this.contentElement.focus();
     },
 
     /**
      * @return {!Element}
@@ skipping 259 matching lines @@
     /**
      * @param {string} id
      * @param {!WebInspector.Widget} view
      */
     changeTabView: function(id, view)
     {
         var tab = this._tabsById[id];
         if (tab.view === view)
             return;
 
-        var shouldFocus = tab.view.element.isSelfOrAncestor(WebInspector.currentFocusElement());
+        var shouldFocus = tab.view.hasFocus();
 
         this.suspendInvalidations();
 
         var isSelected = this._currentTab && this._currentTab.id === id;
         if (isSelected)
             this._hideTab(tab);
         tab.view.detach();
         tab.view = view;
         tab.view.attach(this);
         if (isSelected)
@@ skipping 814 matching lines @@
      * @param {!Array.<string>} ids
      */
     closeTabs: function(tabbedPane, ids) { },
 
     /**
      * @param {string} tabId
      * @param {!WebInspector.ContextMenu} contextMenu
      */
     onContextMenu: function(tabId, contextMenu) { }
 }