extensions: fix focus management for all dialogs (not just options).

chrome/browser/resources/extensions/extension_list.js

 // Copyright (c) 2012 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.
 
 <include src="extension_error.js">
 
 /**
  * The type of the extension data object. The definition is based on
  * chrome/browser/ui/webui/extensions/extension_basic_info.cc
  * and
@@ skipping 115 matching lines @@
       this.data_.extensions.forEach(this.createNode_, this);
 
       var idToHighlight = this.getIdQueryParam_();
       if (idToHighlight && $(idToHighlight))
         this.scrollToNode_(idToHighlight);
 
       var idToOpenOptions = this.getOptionsQueryParam_();
       if (idToOpenOptions && $(idToOpenOptions))
         this.showEmbeddedExtensionOptions_(idToOpenOptions, true);
 
-      if (this.data_.extensions.length == 0)
-        this.classList.add('empty-extension-list');
-      else
-        this.classList.remove('empty-extension-list');
+      var noExtensions = this.data_.extensions.length == 0;
+      this.classList.toggle('empty-extension-list', noExtensions);
     },
 
     /**
      * Scrolls the page down to the extension node with the given id.
      * @param {string} extensionId The id of the extension to scroll to.
      * @private
      */
     scrollToNode_: function(extensionId) {
       // Scroll offset should be calculated slightly higher than the actual
       // offset of the element being scrolled to, so that it ends up not all
@@ skipping 411 matching lines @@
       var extension = this.data_.extensions.filter(function(extension) {
         return extension.enabled && extension.id == extensionId;
       })[0];
 
       if (!extension)
         return;
 
       if (scroll)
         this.scrollToNode_(extensionId);
 
-      document.activeElement.blur();
-
       // Add the options query string. Corner case: the 'options' query string
       // will clobber the 'id' query string if the options link is clicked when
       // 'id' is in the URL, or if both query strings are in the URL.
       uber.replaceState({}, '?options=' + extensionId);
 
+      var overlay = extensions.ExtensionOptionsOverlay.getInstance();
       var shownCallback = function() {
+        // This overlay doesn't get focused automatically as <extensionoptions>
+        // is created after the overlay is shown.
         if (cr.ui.FocusOutlineManager.forDocument(document).visible)
           overlay.setInitialFocus();
       };
-
-      var overlay = extensions.ExtensionOptionsOverlay.getInstance();
       overlay.setExtensionAndShowOverlay(extensionId, extension.name,
                                          extension.icon, shownCallback);
       this.optionsShown_ = true;
 
       var self = this;
       $('overlay').addEventListener('cancelOverlay', function f() {
-        // Restore focus instead of just blurring when this page isn't rebuild
-        // crazy. http://crbug.com/450818
-        document.activeElement.blur();
         self.optionsShown_ = false;
         $('overlay').removeEventListener('cancelOverlay', f);
       });
 
-      // TODO(dbeam): guestview's focus is weird. Only when this is called from
-      // within this event handler *and* after the showing animation completes
-      // does this work.
-      shownCallback();
+      // TODO(dbeam): why do we need to focus <extensionoptions> before and
+      // after its showing animation? Makes very little sense to me.
+      overlay.setInitialFocus();
     },
   };
 
   return {
     ExtensionsList: ExtensionsList
   };
 });