chrome/browser/ui/tab_contents/tab_contents.cc - Issue 11411267: Make sure to display an errors that occur during the chrome sign in process

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/tab_contents/tab_contents.cc

Issue 11411267: Make sure to display an errors that occur during the chrome sign in process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix ntp bubble Created 8 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

« chrome/browser/ui/sync/one_click_signin_helper_unittest.cc ('K') | « chrome/browser/ui/sync/one_click_signin_helper_unittest.cc ('k') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('j') | chrome/browser/ui/webui/ntp/ntp_login_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_contents/tab_contents.cc

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

index 06ed203224fed536dc09fedc69de22fda1f422ea..d939ab2163ae007c825b41e08035f3da18aaaf80 100644

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

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

@@ -188,8 +188,10 @@ TabContents::TabContents(WebContents* contents)

// because the connected state may change while this tab is open. Having a

// one-click signin helper attached does not cause problems if the profile

// happens to be already connected.

- if (OneClickSigninHelper::CanOffer(contents, "", false))

- OneClickSigninHelper::CreateForWebContents(contents);

+ int error_message_id = 0;

+ if (OneClickSigninHelper::CanOffer(contents,

Andrew T Wilson (Slow) 2012/12/03 14:54:49 Consider just passing null here for error_message_

Roger Tawa OOO till Jul 10th 2012/12/03 22:26:54 Done.

+ OneClickSigninHelper::CAN_OFFER_FOR_ALL, "", &error_message_id))

+ OneClickSigninHelper::CreateForWebContents(contents);

#endif

#if defined(OS_WIN)