Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5267)

Unified Diff: chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc

Issue 10868116: Pass result of blockage across content API when new tab blocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc
===================================================================
--- chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc (revision 154977)
+++ chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc (working copy)
@@ -19,6 +19,7 @@
#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;
@@ -88,6 +89,7 @@
}
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
@@ -109,16 +111,21 @@
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(

Powered by Google App Engine
This is Rietveld 408576698