Merge 32335...

chrome/browser/views/browser_bubble_win.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_bubble.h"
 
 #include "app/l10n_util_win.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
@@ skipping 40 matching lines @@
     if (!delegate) {
       if (action == WA_INACTIVE && !closed_) {
         bubble_->DetachFromBrowser();
         delete bubble_;
       }
       return;
     }
 
     if (action == WA_INACTIVE && !closed_) {
       delegate->BubbleLostFocus(bubble_);
-    } else if (action == WA_ACTIVE) {
+    }
+  }
+
+  virtual void OnSetFocus(HWND focused_window) {
+    BrowserBubble::Delegate* delegate = bubble_->delegate();
+    if (delegate)
       delegate->BubbleGotFocus(bubble_);
-    }
   }
 
  private:
   bool closed_;
   BrowserBubble* bubble_;
 };
 
 void BrowserBubble::InitPopup() {
   // popup_ is a Widget, but we need to do some WidgetWin stuff first, then
   // we'll assign it into popup_.
@@ skipping 19 matching lines @@
   visible_ = true;
 }
 
 void BrowserBubble::Hide() {
   if (!visible_)
     return;
   views::WidgetWin* pop = static_cast<views::WidgetWin*>(popup_);
   pop->Hide();
   visible_ = false;
 }