Fixes instant so that it correctly deals with child contents. I've

changed around BlockedPopupContainer so that it can handle any types
and made TabContents offer a mode to block all child content.

BUG=58927
TEST=enable instant, go to a site that would normally show a popup on
     entering (or explicitly enable all popups). While typing in
     the omnibox the popup shouldn't appear, but as soon as you
     commit the instant result it should appear.

Review URL: http://codereview.chromium.org/3694005

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc
index 7b13dcd..65f1baa 100644
--- a/chrome/browser/content_setting_bubble_model.cc
+++ b/chrome/browser/content_setting_bubble_model.cc
@@ -7,7 +7,7 @@
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/blocked_popup_container.h"
+#include "chrome/browser/blocked_content_container.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -329,12 +329,12 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup {
  private:
   void SetPopups() {
     // check for crbug.com/53176
-    if (!tab_contents()->blocked_popup_container())
+    if (!tab_contents()->blocked_content_container())
       return;
-    BlockedPopupContainer::BlockedContents blocked_contents;
-    tab_contents()->blocked_popup_container()->GetBlockedContents(
+    std::vector<TabContents*> blocked_contents;
+    tab_contents()->blocked_content_container()->GetBlockedContents(
         &blocked_contents);
-    for (BlockedPopupContainer::BlockedContents::const_iterator
+    for (std::vector<TabContents*>::const_iterator
          i(blocked_contents.begin()); i != blocked_contents.end(); ++i) {
       std::string title(UTF16ToUTF8((*i)->GetTitle()));
       // The popup may not have committed a load yet, in which case it won't
@@ -350,8 +350,8 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup {
   }
 
   virtual void OnPopupClicked(int index) {
-    if (tab_contents() && tab_contents()->blocked_popup_container()) {
-      tab_contents()->blocked_popup_container()->LaunchPopupForContents(
+    if (tab_contents() && tab_contents()->blocked_content_container()) {
+      tab_contents()->blocked_content_container()->LaunchForContents(
           bubble_content().popup_items[index].tab_contents);
     }
   }