Fix window.open()/window.close() regression by disabling window.close() until a message comes back

from the Browser thread saying that it's OK to allow javascript close calls.

ISSUE=http://crbug.com/4007
Review URL: http://codereview.chromium.org/12691

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

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index 0c0b34d..4afc290 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -486,6 +486,10 @@ void WebContents::SetDownloadShelfVisible(bool visible) {
   }
 }
 
+void WebContents::PopupNotificationVisibilityChanged(bool visible) {
+  render_view_host()->PopupNotificationVisibilityChanged(visible);
+}
+
 // Stupid view pass-throughs
 void WebContents::CreateView() {
   view_->CreateView();
@@ -847,11 +851,8 @@ void WebContents::UpdateThumbnail(const GURL& url,
 }
 
 void WebContents::Close(RenderViewHost* rvh) {
-  // Ignore this if it comes from a RenderViewHost that we aren't showing, and
-  // refuse to allow javascript to close this window if we have a blocked popup
-  // notification.
-  if (delegate() && rvh == render_view_host() &&
-      !ShowingBlockedPopupNotification())
+  // Ignore this if it comes from a RenderViewHost that we aren't showing.
+  if (delegate() && rvh == render_view_host())
     delegate()->CloseContents(this);
 }