Don't close ExtensionPopups on child window focus (Win, non-Aura).

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

 // Copyright (c) 2011 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"
@@ skipping 21 matching lines @@
     ExtensionHost* host,
     views::View* anchor_view,
     views::BubbleBorder::ArrowLocation arrow_location,
     bool inspect_with_devtools)
     : BubbleDelegateView(anchor_view, arrow_location),
       extension_host_(host),
       inspect_with_devtools_(inspect_with_devtools) {
   SetLayoutManager(new views::FillLayout());
   AddChildView(host->view());
   host->view()->SetContainer(this);
+#if defined(OS_WIN) && !defined(USE_AURA)
+  // Use OnNativeFocusChange to check for child window activation on deactivate.
+  set_close_on_deactivate(false);
+#else
   set_close_on_deactivate(!inspect_with_devtools);
+#endif
 
   // We wait to show the popup until the contained host finishes loading.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                  content::Source<Profile>(host->profile()));
 
   // 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 chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
       // Once we receive did stop loading, the content will be complete and
       // the width will have been computed.  Now it's safe to show.
       if (host() == content::Details<ExtensionHost>(details).ptr()) {
@@ skipping 32 matching lines @@
 }
 
 gfx::Size ExtensionPopup::GetPreferredSize() {
   // Constrain the size to popup min/max.
   gfx::Size sz = views::View::GetPreferredSize();
   sz.set_width(std::max(kMinWidth, std::min(kMaxWidth, sz.width())));
   sz.set_height(std::max(kMinHeight, std::min(kMaxHeight, sz.height())));
   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)
+      return;
+    gfx::NativeView focused_parent = focused_now;
+    while (focused_parent = ::GetParent(focused_parent)) {
+      if (this_window == focused_parent)
+        return;
+    }
+    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);
 
   // TODO(msw): Use half the corner radius as contents margins so that contents
   // fit better in the bubble. See http://crbug.com/80416.
 
   // 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();
   }
 
   return popup;
 }