Making browser bubble notifies to its delegate whether it

lost focus to a child window.  This is used to prevent
closing browser/page action bubble when they lose focus
to a select popup or alert box.

BUG=37784
TEST=Start Chrome with extensions that have a page action
     and browser action that contains selects (combobox)
     and a way to show an alert box.  Verify that showing
     the select popup or the alert dialog does not cause
     the bubble to close.

Review URL: http://codereview.chromium.org/899002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41630 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 1 deletions

diff --git a/chrome/browser/views/browser_bubble_win.cc b/chrome/browser/views/browser_bubble_win.cc
index a74b84a..c9add4f 100644
--- a/chrome/browser/views/browser_bubble_win.cc
+++ b/chrome/browser/views/browser_bubble_win.cc
@@ -59,7 +59,24 @@ class BubbleWidget : public views::WidgetWin {
     }
 
     if (action == WA_INACTIVE && !closed_) {
-      delegate->BubbleLostFocus(bubble_, window);
+      bool lost_focus_to_child = false;
+
+      // Are we a parent of this window?
+      gfx::NativeView parent = window;
+      while (parent = ::GetParent(parent)) {
+        if (window == GetNativeView()) {
+          lost_focus_to_child = true;
+          break;
+        }
+      }
+
+      // Do we own this window?
+      if (!lost_focus_to_child &&
+          ::GetWindow(window, GW_OWNER) == GetNativeView()) {
+        lost_focus_to_child = true;
+      }
+
+      delegate->BubbleLostFocus(bubble_, lost_focus_to_child);
     }
   }