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

chrome/browser/ui/browser_tabstrip.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/browser_tabstrip.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 76 matching lines @@
   return params.target_contents;
 }
 
 void AddTab(Browser* browser,
             TabContents* tab_contents,
             content::PageTransition type) {
   browser->tab_strip_model()->AddTabContents(tab_contents, -1, type,
                                              TabStripModel::ADD_ACTIVE);
 }
 
-void AddWebContents(Browser* browser,
+bool AddWebContents(Browser* browser,
                     content::WebContents* source_contents,
                     content::WebContents* new_contents,
                     WindowOpenDisposition disposition,
                     const gfx::Rect& initial_pos,
                     bool user_gesture) {
   // No code for this yet.
   DCHECK(disposition != SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.
   DCHECK(disposition != CURRENT_TAB);
 
   TabContents* source_tab_contents = NULL;
   BlockedContentTabHelper* source_blocked_content = NULL;
   TabContents* new_tab_contents = TabContents::FromWebContents(new_contents);
   if (!new_tab_contents) {
     new_tab_contents =
         BrowserTabstripTabContentsCreator::CreateTabContents(new_contents);
   }
   if (source_contents) {
     source_tab_contents = TabContents::FromWebContents(source_contents);
     source_blocked_content = source_tab_contents->blocked_content_tab_helper();
   }
 
   if (source_tab_contents) {
-    // Handle blocking of all contents.
+    // Handle blocking of tabs,
     if (source_blocked_content->all_contents_blocked()) {
-      source_blocked_content->AddTabContents(new_tab_contents,
-                                             disposition,
-                                             initial_pos,
-                                             user_gesture);
-      return;
+      source_blocked_content->AddTabContents(
+          new_tab_contents, disposition, initial_pos, user_gesture);
+      return false;
     }
 
     // Handle blocking of popups.
-    if ((disposition == NEW_POPUP) && !user_gesture &&
+    if ((disposition == NEW_POPUP || disposition == NEW_FOREGROUND_TAB) &&
+        !user_gesture &&
         !CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisablePopupBlocking)) {
       // Unrequested popups from normal pages are constrained unless they're in
       // the white list.  The popup owner will handle checking this.
-      source_tab_contents->blocked_content_tab_helper()->
-          AddPopup(new_tab_contents, initial_pos, user_gesture);
-      return;
+      source_blocked_content->AddPopup(
+          new_tab_contents, disposition, initial_pos, user_gesture);
+      return false;
     }
 
     new_contents->GetRenderViewHost()->DisassociateFromPopupCount();
   }
 
   NavigateParams params(browser, new_tab_contents);
   params.source_contents = source_contents ?
       GetTabContentsAt(browser, GetIndexOfTab(browser, source_contents)) : NULL;
   params.disposition = disposition;
   params.window_bounds = initial_pos;
   params.window_action = NavigateParams::SHOW_WINDOW;
   params.user_gesture = user_gesture;
   Navigate(&params);
+  return true;
 }
 
 void CloseWebContents(Browser* browser, content::WebContents* contents) {
   int index = browser->tab_strip_model()->GetIndexOfWebContents(contents);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED() << "CloseWebContents called for tab not in our strip";
     return;
   }
   browser->tab_strip_model()->CloseTabContentsAt(
       index,
@@ skipping 25 matching lines @@
   return BrowserTabstripTabContentsCreator::CreateTabContents(
       content::WebContents::CreateWithSessionStorage(
           profile,
           site_instance,
           routing_id,
           base_web_contents,
           session_storage_namespace_map));
 }
 
 }  // namespace chrome