Tweak Win ExtensionPopup::OnNativeFocusChange logic.

chrome/browser/ui/views/extensions/extension_popup.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/ui/views/extensions/extension_popup.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 38 matching lines @@
   set_close_on_deactivate(!inspect_with_devtools);
 #endif
 
   // Wait to show the popup until the contained host finishes loading.
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                  content::Source<WebContents>(host->host_contents()));
 
   // Listen for the containing view calling window.close();
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE,
                  content::Source<Profile>(host->profile()));
-
-  views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
 }
 
 ExtensionPopup::~ExtensionPopup() {
   views::WidgetFocusManager::GetInstance()->RemoveFocusChangeListener(this);
 }
 
 void ExtensionPopup::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME:
       DCHECK(content::Source<WebContents>(host()->host_contents()) == source);
       // Show when the content finishes loading and its width is computed.
-      Show();
-      // Focus on the host contents when the bubble is first shown.
-      host()->host_contents()->Focus();
-      if (inspect_with_devtools_) {
-        // Listen for the the devtools window closing.
-        registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
-            content::Source<content::BrowserContext>(host()->profile()));
-        DevToolsWindow::ToggleDevToolsWindow(host()->render_view_host(),
-            DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
-      }
+      ShowBubble();
       break;
     case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
       if (content::Details<ExtensionHost>(host()) == details)
         GetWidget()->Close();
       break;
     case content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING:
       // Make sure its the devtools window that inspecting our popup.
       // Widget::Close posts a task, which should give the devtools window a
       // chance to finish detaching from the inspected RenderViewHost.
@@ skipping 18 matching lines @@
   return sz;
 }
 
 void ExtensionPopup::OnNativeFocusChange(gfx::NativeView focused_before,
                                          gfx::NativeView focused_now) {
   // TODO(msw): Implement something equivalent for Aura. See crbug.com/106958
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Don't close if a child of this window is activated (only needed on Win).
   // ExtensionPopups can create Javascipt dialogs; see crbug.com/106723.
   gfx::NativeView this_window = GetWidget()->GetNativeView();
-  if (!inspect_with_devtools_ && focused_before == this_window) {
-    DCHECK_NE(focused_now, this_window);
-    if (::GetWindow(focused_now, GW_OWNER) == this_window)
+  if (inspect_with_devtools_ || focused_now == this_window ||
+      ::GetWindow(focused_now, GW_OWNER) == this_window)
+    return;
+  gfx::NativeView focused_parent = focused_now;
+  while (focused_parent = ::GetParent(focused_parent)) {
+    if (this_window == focused_parent)
       return;
-    gfx::NativeView focused_parent = focused_now;
-    while (focused_parent = ::GetParent(focused_parent)) {
-      if (this_window == focused_parent)
-        return;
-    }
-    GetWidget()->Close();
   }
+  GetWidget()->Close();
 #endif
 }
 
 // static
 ExtensionPopup* ExtensionPopup::ShowPopup(
     const GURL& url,
     Browser* browser,
     views::View* anchor_view,
     views::BubbleBorder::ArrowLocation arrow_location,
     bool inspect_with_devtools) {
   ExtensionProcessManager* manager =
       browser->profile()->GetExtensionProcessManager();
   ExtensionHost* host = manager->CreatePopupHost(url, browser);
   ExtensionPopup* popup = new ExtensionPopup(browser, host, anchor_view,
       arrow_location, inspect_with_devtools);
   browser::CreateViewsBubble(popup);
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
-  if (host->did_stop_loading()) {
-    popup->Show();
-    // Focus on the host contents when the bubble is first shown.
-    host->host_contents()->Focus();
-  }
+  if (host->did_stop_loading())
+    popup->ShowBubble();
 
   return popup;
 }
+
+void ExtensionPopup::ShowBubble() {
+  Show();
+
+  // Focus on the host contents when the bubble is first shown.
+  host()->host_contents()->Focus();
+
+  // Listen for widget focus changes after showing (used for non-aura win).
+  views::WidgetFocusManager::GetInstance()->AddFocusChangeListener(this);
+
+  if (inspect_with_devtools_) {
+    // Listen for the the devtools window closing.
+    registrar_.Add(this, content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING,
+        content::Source<content::BrowserContext>(host()->profile()));
+    DevToolsWindow::ToggleDevToolsWindow(host()->render_view_host(),
+        DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE);
+  }
+}