Resubmit http://codereview.chromium.org/243096 with gcc compile error fixed.

BUG=23832
TBR=mpcomplete

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

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

3 files changed, 33 insertions, 3 deletions

diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 3baa908..766a12e 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -31,9 +31,8 @@
 #include "chrome/common/view_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
-
 #include "grit/browser_resources.h"
-
+#include "views/widget/widget.h"
 #include "webkit/glue/context_menu.h"
 
 using WebKit::WebDragOperation;
@@ -339,10 +338,26 @@ void ExtensionHost::RunJavaScriptMessage(const std::wstring& message,
   render_view_host()->JavaScriptMessageBoxClosed(reply_msg, true, L"");
 }
 
+void ExtensionHost::Close(RenderViewHost* render_view_host) {
+  if (extension_host_type_ == ViewType::EXTENSION_POPUP) {
+#if defined(TOOLKIT_VIEWS)
+    // TODO(erikkay) This is a bit of a hack.  By hiding the widget, we trigger
+    // a deactivation which will then bubble into ExtensionPopup and actually
+    // close the popup. Perhaps we should have a more explicit delegate to
+    // ExtensionHost.
+    view_->GetWidget()->Hide();
+#endif
+  }
+}
+
 WebPreferences ExtensionHost::GetWebkitPrefs() {
   PrefService* prefs = render_view_host()->process()->profile()->GetPrefs();
   const bool kIsDomUI = true;
-  return RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, kIsDomUI);
+  WebPreferences webkit_prefs =
+      RenderViewHostDelegateHelper::GetWebkitPrefs(prefs, kIsDomUI);
+  if (extension_host_type_ == ViewType::EXTENSION_POPUP)
+    webkit_prefs.allow_scripts_to_close_windows = true;
+  return webkit_prefs;
 }
 
 void ExtensionHost::ProcessDOMUIMessage(const std::string& message,
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 9a0f23e..c5aeeba 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -112,6 +112,7 @@ class ExtensionHost : public RenderViewHostDelegate,
                                     const int flags,
                                     IPC::Message* reply_msg,
                                     bool* did_suppress_message);
+  virtual void Close(RenderViewHost* render_view_host);
 
   // RenderViewHostDelegate::View
   virtual void CreateNewWindow(int route_id);
diff --git a/chrome/browser/views/browser_bubble_win.cc b/chrome/browser/views/browser_bubble_win.cc
index 8cae2da..17ab8ca 100644
--- a/chrome/browser/views/browser_bubble_win.cc
+++ b/chrome/browser/views/browser_bubble_win.cc
@@ -27,9 +27,23 @@ public:
     if (closed_)
       return;
     closed_ = true;
+    if (IsActive()) {
+      BrowserBubble::Delegate* delegate = bubble_->delegate();
+      if (delegate)
+        delegate->BubbleLostFocus(bubble_);
+    }
     views::WidgetWin::Close();
   }
 
+  void Hide() {
+    if (IsActive()) {
+      BrowserBubble::Delegate* delegate = bubble_->delegate();
+      if (delegate)
+        delegate->BubbleLostFocus(bubble_);
+    }
+    views::WidgetWin::Hide();
+  }
+
   void OnActivate(UINT action, BOOL minimized, HWND window) {
     BrowserBubble::Delegate* delegate = bubble_->delegate();
     if (!delegate)