chrome/browser/android/tab_android.cc - Issue 1107663003: Properly attach InfoBarContainer when it is swapped to a new WebContents

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/android/tab_android.cc

Issue 1107663003: Properly attach InfoBarContainer when it is swapped to a new WebContents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2357

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java ('k') | chrome/browser/ui/android/infobars/infobar_container_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/tab_android.cc

diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc

index 1553094429d84de04495808eef3831caef8bfa23..f430c19aa6d5cbb1cfbfb4b7bf54fa0f2b21a7ff 100644

--- a/chrome/browser/android/tab_android.cc

+++ b/chrome/browser/android/tab_android.cc

@@ -294,17 +294,6 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents,

bool did_start_load,

bool did_finish_load) {

JNIEnv* env = base::android::AttachCurrentThread();

- // We need to notify the native InfobarContainer so infobars can be swapped.

- InfoBarContainerAndroid* infobar_container =

- reinterpret_cast<InfoBarContainerAndroid*>(

- Java_Tab_getNativeInfoBarContainer(

- env,

- weak_java_tab_.get(env).obj()));

- InfoBarService* new_infobar_service =

- new_contents ? InfoBarService::FromWebContents(new_contents) : NULL;

- infobar_container->ChangeInfoBarManager(new_infobar_service);

Java_Tab_swapWebContents(

env,

weak_java_tab_.get(env).obj(),