chrome/browser/ui/browser.cc - Issue 7477021: Pass Setup Chrome Sync to main profile from Incognito.

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

Issue 7477021: Pass Setup Chrome Sync to main profile from Incognito. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 5 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/ui/browser.cc

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

index 9469c4b6dbd88261eb89e1e8b039fe23fa6a685b..3b7cb6882724707e88f2d89d6cb19bc547b096ce 100644

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

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

@@ -4792,9 +4792,10 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) {

}

void Browser::ShowSyncSetup() {

- ProfileSyncService* service = profile()->GetProfileSyncService();

+ ProfileSyncService* service =

+ profile()->GetOriginalProfile()->GetProfileSyncService();

if (service->HasSyncSetupCompleted())

ShowOptionsTab(chrome::kSyncSetupSubPage);

else

- profile()->GetProfileSyncService()->ShowLoginDialog();

+ service->ShowLoginDialog();

}

« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »