content/browser/tab_contents/tab_contents_view.cc - Issue 6854035: Move blocked content from TabContents to TabContentsWrapper.

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: content/browser/tab_contents/tab_contents_view.cc

Issue 6854035: Move blocked content from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: put back user_gesture Created 9 years, 8 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: content/browser/tab_contents/tab_contents_view.cc

diff --git a/content/browser/tab_contents/tab_contents_view.cc b/content/browser/tab_contents/tab_contents_view.cc

index ab398d7128b096130175874e2a838a40c0d777a7..48d6b62ec9e1bd38948cd324cfc8ca59e48005fc 100644

--- a/content/browser/tab_contents/tab_contents_view.cc

+++ b/content/browser/tab_contents/tab_contents_view.cc

@@ -68,7 +68,7 @@ void TabContentsView::ShowCreatedWindow(int route_id,

bool user_gesture) {

TabContents* contents = delegate_view_helper_.GetCreatedWindow(route_id);

if (contents) {

- tab_contents()->AddOrBlockNewContents(

+ tab_contents()->AddNewContents(

contents, disposition, initial_pos, user_gesture);

}