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

chrome/browser/extensions/extension_host.cc

 // Copyright (c) 2006-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/extensions/extension_host.h"
 
 #include <list>
 
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #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;
 using WebKit::WebDragOperationsMask;
 
 // static
 bool ExtensionHost::enable_dom_automation_ = false;
 
 static const char* kToolstripTextColorSubstitution = "$TEXT_COLOR$";
 
@@ skipping 285 matching lines @@
                                          const GURL& frame_url,
                                          const int flags,
                                          IPC::Message* reply_msg,
                                          bool* did_suppress_message) {
   // Automatically cancel the javascript alert (otherwise the renderer hangs
   // indefinitely).
   *did_suppress_message = true;
   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,
                                         const std::string& content,
                                         int request_id,
                                         bool has_callback) {
   if (extension_function_dispatcher_.get()) {
     extension_function_dispatcher_->HandleRequest(message, content, request_id,
                                                   has_callback);
   }
@@ skipping 140 matching lines @@
     window_id = ExtensionTabUtil::GetWindowId(
         const_cast<ExtensionHost* >(this)->GetBrowser());
   } else if (extension_host_type_ == ViewType::EXTENSION_BACKGROUND_PAGE) {
     // Background page is not attached to any browser window, so pass -1.
     window_id = -1;
   } else {
     NOTREACHED();
   }
   return window_id;
 }