chrome/browser/ui/auto_login_prompter.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

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/ui/auto_login_prompter.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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/browser/translate/translate_tab_helper.cc ('k') | chrome/browser/ui/blocked_content/blocked_content_tab_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/auto_login_prompter.cc

diff --git a/chrome/browser/ui/auto_login_prompter.cc b/chrome/browser/ui/auto_login_prompter.cc

index ae47d6373df79af01237626e6c022ad212c8d1cf..9bb0994a74753c603372a12c410f89d3ace5b69e 100644

--- a/chrome/browser/ui/auto_login_prompter.cc

+++ b/chrome/browser/ui/auto_login_prompter.cc

@@ -227,7 +227,7 @@ AutoLoginPrompter::AutoLoginPrompter(

args_(args) {

registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

- &tab_contents_->GetController()));

+ &tab_contents_->controller()));

registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,

content::Source<TabContents>(tab_contents_));

}

@@ -333,7 +333,7 @@ void AutoLoginPrompter::Observe(int type,

InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();

Profile* profile = wrapper->profile();

infobar_helper->AddInfoBar(new AutoLoginInfoBarDelegate(

- infobar_helper, &tab_contents_->GetController(),

+ infobar_helper, &tab_contents_->controller(),

profile->GetTokenService(), profile->GetPrefs(),

username_, args_));

}