chrome/browser/android/tab_android.cc - Issue 211273007: Split InfoBarService core code into InfoBarManager

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 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix android compilation Created 6 years, 9 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/android/tab_android.cc

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

index 91e131c971624e4dd4e5326c10a96682c3184f89..9e5ac9bc568b38d9a71d7d8a5402a7ccdb1d8807 100644

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

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

@@ -229,9 +229,9 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents,

Java_Tab_getNativeInfoBarContainer(

env,

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

- InfoBarService* new_infobar_service = new_contents ?

- InfoBarService::FromWebContents(new_contents) : NULL;

- infobar_container->ChangeInfoBarService(new_infobar_service);

+ InfoBarManager* new_infobar_manager = new_contents ?

+ &InfoBarService::FromWebContents(new_contents)->infobar_manager() : NULL;

+ infobar_container->ChangeInfoBarManager(new_infobar_manager);

Java_Tab_swapWebContents(

env,