Make sure we don't dismiss extension popups when the focus...

chrome/browser/views/browser_actions_container.cc

 // Copyright (c) 2009 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/views/browser_actions_container.h"
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 441 matching lines @@
 }
 
 void BrowserActionsContainer::BubbleGotFocus(BrowserBubble* bubble) {
   if (!popup_)
     return;
 
   // Forward the focus to the renderer.
   popup_->host()->render_view_host()->view()->Focus();
 }
 
-void BrowserActionsContainer::BubbleLostFocus(BrowserBubble* bubble) {
+void BrowserActionsContainer::BubbleLostFocus(BrowserBubble* bubble,
+                                              gfx::NativeView focused_view) {
   if (!popup_)
     return;
 
+#if defined(OS_WIN)
+  // Don't hide when we are loosing focus to a child window.  This is the case
+  // with select popups.
+  // TODO(jcampan): http://crbugs.com/29131 make that work on toolkit views

[Erik does not do reviews, 2009/12/02 01:26:11]

typo: crbug.com

+  //                so this #if defined can be removed.
+  gfx::NativeView popup_native_view = popup_->native_view();
+  gfx::NativeView parent = focused_view;
+  while (parent = ::GetParent(parent)) {
+    if (parent == popup_native_view)
+      return;
+  }
+#endif
+
   // This is a bit annoying.  If you click on the button that generated the
   // current popup, then we first get this lost focus message, and then
   // we get the click action.  This results in the popup being immediately
   // shown again.  To workaround this, we put in a delay.
   MessageLoop::current()->PostTask(FROM_HERE,
       task_factory_.NewRunnableMethod(&BrowserActionsContainer::HidePopup));
 }
 
 int BrowserActionsContainer::GetClippedPreferredWidth(int available_width) {
   if (browser_action_views_.size() == 0)
     return 0;
 
   // We have at least one browser action. Make some of them sticky.
   int min_width = kHorizontalPadding * 2 +
       std::min(static_cast<int>(browser_action_views_.size()),
                kMinimumNumberOfVisibleBrowserActions) * kButtonSize;
 
   // Even if available_width is <= 0, we still return at least the |min_width|.
   if (available_width <= 0)
     return min_width;
 
   return std::max(min_width, available_width - available_width % kButtonSize +
                   kHorizontalPadding * 2);
 }