Pass result of blockage across content API when new tab blocked.

chrome/browser/ui/blocked_content/blocked_content_container.cc

 // Copyright (c) 2012 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/ui/blocked_content/blocked_content_container.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 57 matching lines @@
     if (i->tab_contents == tab_contents) {
       // To support the owner blocking the content again we copy and erase
       // before attempting to add.
       BlockedContent content(*i);
       blocked_contents_.erase(i);
       i = blocked_contents_.end();
       tab_contents->web_contents()->SetDelegate(NULL);
       tab_contents->blocked_content_tab_helper()->set_delegate(NULL);
       // We needn't call WasShown to change its status because the
       // WebContents::AddNewContents will do it.
-      owner_->web_contents()->AddNewContents(
-          tab_contents->web_contents(),
-          content.disposition,
-          content.bounds,
-          content.user_gesture);
+      WebContentsDelegate* delegate = owner_->web_contents()->GetDelegate();
+      if (delegate) {
+        delegate->AddNewContents(owner_->web_contents(),
+                                 tab_contents->web_contents(),
+                                 content.disposition,
+                                 content.bounds,
+                                 content.user_gesture,
+                                 NULL);
+      }
       break;
     }
   }
 }
 
 size_t BlockedContentContainer::GetBlockedContentsCount() const {
   return blocked_contents_.size();
 }
 
 void BlockedContentContainer::GetBlockedContents(
@@ skipping 20 matching lines @@
 WebContents* BlockedContentContainer::OpenURLFromTab(
     WebContents* source,
     const OpenURLParams& params) {
   return owner_->web_contents()->OpenURL(params);
 }
 
 void BlockedContentContainer::AddNewContents(WebContents* source,
                                              WebContents* new_contents,
                                              WindowOpenDisposition disposition,
                                              const gfx::Rect& initial_position,
-                                             bool user_gesture) {
-  owner_->web_contents()->AddNewContents(
-      new_contents, disposition, initial_position, user_gesture);
+                                             bool user_gesture,
+                                             bool* was_blocked) {
+  WebContentsDelegate* delegate = owner_->web_contents()->GetDelegate();
+  if (delegate) {
+    delegate->AddNewContents(owner_->web_contents(), new_contents, disposition,
+                             initial_position, user_gesture, was_blocked);
+  }
 }
 
 void BlockedContentContainer::CloseContents(WebContents* source) {
   for (BlockedContents::iterator i(blocked_contents_.begin());
        i != blocked_contents_.end(); ++i) {
     TabContents* tab_contents = i->tab_contents;
     if (tab_contents->web_contents() == source) {
       tab_contents->web_contents()->SetDelegate(NULL);
       tab_contents->blocked_content_tab_helper()->set_delegate(NULL);
       blocked_contents_.erase(i);
@@ skipping 24 matching lines @@
 bool BlockedContentContainer::ShouldSuppressDialogs() {
   // Suppress JavaScript dialogs when inside a constrained popup window (because
   // that activates them and breaks them out of the constrained window jail).
   return true;
 }
 
 TabContents* BlockedContentContainer::GetConstrainingTabContents(
     TabContents* source) {
   return owner_;
 }