chrome/browser/instant/instant_loader.cc - Issue 10938033: Switch BlockedContentTabHelper to use WebContentsUserData.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/instant/instant_loader.cc

Issue 10938033: Switch BlockedContentTabHelper to use WebContentsUserData. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

Index: chrome/browser/instant/instant_loader.cc

diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc

index 4da895ad07f0bd99cce0058e3f27bccc9d3a279e..5d6d9c7401bacd459cbb682f2779e9cb516a2f09 100644

--- a/chrome/browser/instant/instant_loader.cc

+++ b/chrome/browser/instant/instant_loader.cc

@@ -378,7 +378,8 @@ void InstantLoader::SetupPreviewContents() {

// Disable popups and such (mainly to avoid losing focus and reverting the

// preview prematurely).

- preview_contents_->blocked_content_tab_helper()->SetAllContentsBlocked(true);

+ BlockedContentTabHelper::FromWebContents(new_contents)->

+ SetAllContentsBlocked(true);

preview_contents_->constrained_window_tab_helper()->

set_delegate(new_delegate);

preview_contents_->content_settings()->SetPopupsBlocked(true);

@@ -404,7 +405,8 @@ void InstantLoader::CleanupPreviewContents() {

old_contents->SetDelegate(NULL);

preview_delegate_.reset();

- preview_contents_->blocked_content_tab_helper()->SetAllContentsBlocked(false);

+ BlockedContentTabHelper::FromWebContents(old_contents)->

+ SetAllContentsBlocked(false);

preview_contents_->constrained_window_tab_helper()->set_delegate(NULL);

preview_contents_->content_settings()->SetPopupsBlocked(false);

CoreTabHelper::FromWebContents(old_contents)->set_delegate(NULL);