Index: chrome/browser/android/tab_android.cc |
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc |
index 7a9741861fa274dd34ed48d6197c436277abf065..74800b015327099146cc292197e7d067cec61e91 100644 |
--- a/chrome/browser/android/tab_android.cc |
+++ b/chrome/browser/android/tab_android.cc |
@@ -31,6 +31,7 @@ |
#include "chrome/browser/ui/android/window_android_helper.h" |
#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h" |
#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
+#include "chrome/browser/ui/blocked_content/popup_blocked_infobar_delegate.h" |
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" |
#include "chrome/browser/ui/browser_tab_contents.h" |
#include "chrome/browser/ui/find_bar/find_tab_helper.h" |
@@ -170,6 +171,7 @@ void TabAndroid::Observe(int type, |
JNIEnv* env = base::android::AttachCurrentThread(); |
switch (type) { |
case chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED: { |
+ LOG(WARNING) << "OBSERVING.. " << type; |
TabSpecificContentSettings* settings = |
TabSpecificContentSettings::FromWebContents(web_contents()); |
if (!settings->IsBlockageIndicated(CONTENT_SETTINGS_TYPE_POPUPS)) { |
@@ -182,9 +184,12 @@ void TabAndroid::Observe(int type, |
if (popup_blocker_helper) |
num_popups = popup_blocker_helper->GetBlockedPopupsCount(); |
- Java_TabBase_onBlockedPopupsStateChanged(env, |
- weak_java_tab_.get(env).obj(), |
- num_popups); |
+ if (num_popups > 0) { // move this check to the create method |
+ LOG(WARNING) << "INCOMING POPUP " << num_popups; |
+ PopupBlockedInfoBarDelegate::Create(InfoBarService::FromWebContents( |
+ web_contents()), num_popups); |
+ } |
+ |
settings->SetBlockageHasBeenIndicated(CONTENT_SETTINGS_TYPE_POPUPS); |
} |
break; |