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

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

Index: chrome/browser/ui/views/extensions/extension_popup.h
===================================================================
--- chrome/browser/ui/views/extensions/extension_popup.h	(revision 113960)
+++ chrome/browser/ui/views/extensions/extension_popup.h	(working copy)
@@ -12,12 +12,14 @@
 #include "content/public/browser/notification_observer.h"
 #include "googleurl/src/gurl.h"
 #include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/focus/widget_focus_manager.h"
 
 class Browser;
 
 class ExtensionPopup : public views::BubbleDelegateView,
                        public ExtensionView::Container,
-                       public content::NotificationObserver {
+                       public content::NotificationObserver,
+                       public views::WidgetFocusChangeListener {
  public:
   virtual ~ExtensionPopup();
 
@@ -50,9 +52,13 @@
   // ExtensionView::Container overrides.
   virtual void OnExtensionPreferredSizeChanged(ExtensionView* view) OVERRIDE;
 
-  // view::View overrides.
+  // views::View overrides.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
+  // views::WidgetFocusChangeListener overrides.
+  virtual void OnNativeFocusChange(gfx::NativeView focused_before,
+                                   gfx::NativeView focused_now) OVERRIDE;
+
   // The min/max height of popups.
   static const int kMinWidth;
   static const int kMinHeight;