Move blocked content from TabContents to TabContentsWrapper.

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 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.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 54 matching lines @@
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/browser/tab_contents/background_contents.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/tabs/tab_finder.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/download/download_tab_helper.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ skipping 2800 matching lines @@
   // navigation, so we don't have to worry about flickering.
   if (changed_flags & TabContents::INVALIDATE_URL)
     UpdateCommandsForTabState();
 }
 
 void Browser::AddNewContents(TabContents* source,
                              TabContents* new_contents,
                              WindowOpenDisposition disposition,
                              const gfx::Rect& initial_pos,
                              bool user_gesture) {
-  // No code for this yet
+  // 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);
 
+  TabContentsWrapper* source_wrapper = NULL;
+  BlockedContentTabHelper* source_blocked_content = NULL;
+  TabContentsWrapper* new_wrapper = new TabContentsWrapper(new_contents);
+  if (source) {
+    source_wrapper = TabContentsWrapper::GetCurrentWrapperForContents(source);
+    source_blocked_content = source_wrapper->blocked_content_tab_helper();
+  }
+
+  if (source_wrapper) {
+    // Handle blocking of all contents.
+    if (source_blocked_content->all_contents_blocked()) {
+      source_blocked_content->AddTabContents(new_wrapper,
+                                             disposition,
+                                             initial_pos,
+                                             user_gesture);
+      return;
+    }
+
+    // Handle blocking of popups.
+    if ((disposition == NEW_POPUP) && !user_gesture &&
+        !CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kDisablePopupBlocking)) {
+      // Unrequested popups from normal pages are constrained unless they're in
+      // the whitelist.  The popup owner will handle checking this.
+      GetConstrainingContents(source_wrapper)->blocked_content_tab_helper()->
+          AddPopup(new_wrapper, initial_pos, user_gesture);

[stevenjb, 2011/04/21 19:03:00]

Use gesture will always be false here, do we need that parameter in
BlockedContentTabHelper?

[Avi (use Gerrit), 2011/04/21 20:06:02]

Done.

+      return;
+    }
+
+    new_contents->DisassociateFromPopupCount();
+  }
+
   // TODO(beng): This belongs behind the platform-specific View interface.
   //             That's why it's there. http://crbug.com/78853
 #if defined(OS_CHROMEOS)
   if (disposition == NEW_POPUP) {
     // If the popup is bigger than a given factor of the screen, then
     // turn it into a foreground tab (on chrome os only)
     // Also check for width or height == 0, which would otherwise indicate
     // a tab sized popup window.
     GdkScreen* screen = gdk_screen_get_default();
     int max_width = gdk_screen_get_width(screen) * kPopupMaxWidthFactor;
     int max_height = gdk_screen_get_height(screen) * kPopupMaxHeightFactor;
     if (initial_pos.width() > max_width || initial_pos.width() == 0 ||
         initial_pos.height() > max_height || initial_pos.height() == 0) {
       disposition = NEW_FOREGROUND_TAB;
     }
   }
 #endif
 
-  TabContentsWrapper* wrapper = new TabContentsWrapper(new_contents);
-  browser::NavigateParams params(this, wrapper);
+  browser::NavigateParams params(this, new_wrapper);
   params.source_contents =
-      tabstrip_model()->GetTabContentsAt(
-          tabstrip_model()->GetWrapperIndex(source));
+      source ? tabstrip_model()->GetTabContentsAt(
+                   tabstrip_model()->GetWrapperIndex(source))
+             : NULL;
   params.disposition = disposition;
   params.window_bounds = initial_pos;
   // If we create a popup or panel from a non user-gesture, don't activate
   // the new window / panel.
   if (disposition == NEW_POPUP && !user_gesture)
     params.window_action = browser::NavigateParams::SHOW_WINDOW_INACTIVE;
   else
     params.window_action = browser::NavigateParams::SHOW_WINDOW;
   browser::Navigate(&params);
+
+  if (source) {
+    NotificationService::current()->Notify(
+      NotificationType::TAB_ADDED,
+      Source<TabContentsDelegate>(source->delegate()),
+      Details<TabContents>(source));
+  }
 }
 
 void Browser::ActivateContents(TabContents* contents) {
   tab_handler_->GetTabStripModel()->ActivateTabAt(
       tab_handler_->GetTabStripModel()->GetWrapperIndex(contents), false);
   window_->Activate();
 }
 
 void Browser::DeactivateContents(TabContents* contents) {
   window_->Deactivate();
@@ skipping 242 matching lines @@
     return;
 
   TabContents* current_tab = GetSelectedTabContents();
   // We make this check for the case of minimized windows, unit tests, etc.
   if (platform_util::IsVisible(current_tab->GetNativeView()) &&
       ui::Animation::ShouldRenderRichAnimation()) {
     DownloadStartedAnimation::Show(current_tab);
   }
 #endif
 
-  // If the download occurs in a new tab, close it
+  // If the download occurs in a new tab, close it.
+  TabContentsWrapper* wrapper =
+      TabContentsWrapper::GetCurrentWrapperForContents(tab);
   if (tab->controller().IsInitialNavigation() &&
-      GetConstrainingContents(tab) == tab && tab_count() > 1) {
+      GetConstrainingContents(wrapper) == wrapper && tab_count() > 1) {
     CloseContents(tab);
   }
 }
 
 void Browser::ShowPageInfo(Profile* profile,
                            const GURL& url,
                            const NavigationEntry::SSLStatus& ssl,
                            bool show_history) {
   window()->ShowPageInfo(profile, url, ssl, show_history);
 }
@@ skipping 112 matching lines @@
   window()->ConfirmSetDefaultSearchProvider(tab_contents, template_url,
                                             template_url_model);
 }
 
 void Browser::ConfirmAddSearchProvider(const TemplateURL* template_url,
                                        Profile* profile) {
   window()->ConfirmAddSearchProvider(template_url, profile);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// Browser, BlockedContentTabHelperDelegate implementation:
+
+TabContentsWrapper* Browser::GetConstrainingContents(
+  TabContentsWrapper* source) {
+  return source;
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // Browser, SelectFileDialog::Listener implementation:
 
 void Browser::FileSelected(const FilePath& path, int index, void* params) {
   profile_->set_last_selected_directory(path.DirName());
   GURL file_url = net::FilePathToFileURL(path);
   if (!file_url.is_empty())
     OpenURL(file_url, GURL(), CURRENT_TAB, PageTransition::TYPED);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 842 matching lines @@
 
 // static
 Browser* Browser::GetOrCreateTabbedBrowser(Profile* profile) {
   Browser* browser = GetTabbedBrowser(profile, false);
   if (!browser)
     browser = Browser::Create(profile);
   return browser;
 }
 
 void Browser::SetAsDelegate(TabContentsWrapper* tab, Browser* delegate) {
+  // TabContents...
   tab->tab_contents()->set_delegate(delegate);
   tab->set_delegate(delegate);
+
+  // ...and all the helpers.
+  tab->blocked_content_tab_helper()->set_delegate(delegate);
   tab->search_engine_tab_helper()->set_delegate(delegate);
 }
 
 void Browser::FindInPage(bool find_next, bool forward_direction) {
   ShowFindBar();
   if (find_next) {
     string16 find_text;
 #if defined(OS_MACOSX)
     // We always want to search for the contents of the find pasteboard on OS X.
     find_text = GetFindPboardText();
@@ skipping 112 matching lines @@
         INSTANT_COMMIT_PRESSED_ENTER);
     // HideInstant is invoked after release so that InstantController is not
     // active when HideInstant asks it for its state.
     HideInstant();
     preview_contents->controller().PruneAllButActive();
     tab_handler_->GetTabStripModel()->AddTabContents(
         preview_contents,
         -1,
         instant()->last_transition_type(),
         TabStripModel::ADD_ACTIVE);
-    instant()->CompleteRelease(preview_contents->tab_contents());
+    instant()->CompleteRelease(preview_contents);
     return true;
   }
   // The omnibox currently doesn't use other dispositions, so we don't attempt
   // to handle them. If you hit this NOTREACHED file a bug and I'll (sky) add
   // support for the new disposition.
   NOTREACHED();
   return false;
 }
 
 void Browser::CreateInstantIfNecessary() {
@@ skipping 78 matching lines @@
   TabContents* current_tab = GetSelectedTabContents();
   if (current_tab) {
     content_restrictions = current_tab->content_restrictions();
     NavigationEntry* active_entry = current_tab->controller().GetActiveEntry();
     // See comment in UpdateCommandsForTabState about why we call url().
     if (!SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL()))
       content_restrictions |= CONTENT_RESTRICTION_SAVE;
   }
   return content_restrictions;
 }