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

chrome/browser/ui/blocked_content/blocked_content_tab_helper.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_tab_helper.h"
 
 #include "base/auto_reset.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_container.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_delegate.h"
 
 using content::NavigationEntry;
 
 BlockedContentTabHelper::BlockedContentTabHelper(TabContents* tab_contents)
     : content::WebContentsObserver(tab_contents->web_contents()),
       blocked_contents_(new BlockedContentContainer(tab_contents)),
       all_contents_blocked_(false),
       tab_contents_(tab_contents),
       delegate_(NULL) {
 }
@@ skipping 49 matching lines @@
                                              const gfx::Rect& initial_pos,
                                              bool user_gesture) {
   if (!blocked_contents_->GetBlockedContentsCount())
     PopupNotificationVisibilityChanged(true);
   SendNotification(new_contents, true);
   blocked_contents_->AddTabContents(
       new_contents, disposition, initial_pos, user_gesture);
 }
 
 void BlockedContentTabHelper::AddPopup(TabContents* new_contents,
+                                       WindowOpenDisposition disposition,
                                        const gfx::Rect& initial_pos,
                                        bool user_gesture) {
   // A page can't spawn popups (or do anything else, either) until its load
   // commits, so when we reach here, the popup was spawned by the
   // NavigationController's last committed entry, not the active entry.  For
   // example, if a page opens a popup in an onunload() handler, then the active
   // entry is the page to be loaded as we navigate away from the unloading
   // page.  For this reason, we can't use GetURL() to get the opener URL,
   // because it returns the active entry.
   NavigationEntry* entry =
       web_contents()->GetController().GetLastCommittedEntry();
   GURL creator = entry ? entry->GetVirtualURL() : GURL::EmptyGURL();
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 
   if (creator.is_valid() &&
       profile->GetHostContentSettingsMap()->GetContentSetting(
           creator,
           creator,
           CONTENT_SETTINGS_TYPE_POPUPS,
           "") == CONTENT_SETTING_ALLOW) {
-    web_contents()->AddNewContents(new_contents->web_contents(),
-                                   NEW_POPUP,
-                                   initial_pos,
-                                   true);  // user_gesture
+    content::WebContentsDelegate* delegate = web_contents()->GetDelegate();
+    if (delegate) {
+      delegate->AddNewContents(web_contents(),
+                               new_contents->web_contents(),
+                               disposition,
+                               initial_pos,
+                               true,  // user_gesture
+                               NULL);
+    }
   } else {
     // Call blocked_contents_->AddTabContents with user_gesture == true
     // so that the contents will not get blocked again.
     SendNotification(new_contents, true);
     blocked_contents_->AddTabContents(new_contents,
-                                      NEW_POPUP,
+                                      disposition,
                                       initial_pos,
                                       true);  // user_gesture
     tab_contents_->content_settings()->OnContentBlocked(
           CONTENT_SETTINGS_TYPE_POPUPS, std::string());
   }
 }
 
 void BlockedContentTabHelper::LaunchForContents(
     TabContents* tab_contents) {
   SendNotification(tab_contents, false);
   blocked_contents_->LaunchForContents(tab_contents);
   if (!blocked_contents_->GetBlockedContentsCount())
     PopupNotificationVisibilityChanged(false);
 }
 
 size_t BlockedContentTabHelper::GetBlockedContentsCount() const {
   return blocked_contents_->GetBlockedContentsCount();
 }
 
 void BlockedContentTabHelper::GetBlockedContents(
     std::vector<TabContents*>* blocked_contents) const {
   blocked_contents_->GetBlockedContents(blocked_contents);
 }