chrome/browser/signin/account_reconcilor.h - Issue 110373007: Delay loading the NTP after sign in until MergeSession has been performed in

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/signin/account_reconcilor.h

Issue 110373007: Delay loading the NTP after sign in until MergeSession has been performed in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 7 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/extensions/api/webstore_private/webstore_private_api.cc ('k') | chrome/browser/signin/account_reconcilor.cc » ('j') | chrome/browser/signin/google_auto_login_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/account_reconcilor.h

diff --git a/chrome/browser/signin/account_reconcilor.h b/chrome/browser/signin/account_reconcilor.h

index db8f0b7a0a1f6f959d9dbdb4be9850f0b806a814..5f317d5e5f54f9bfb6bd39e7425e6371b26cb7cd 100644

--- a/chrome/browser/signin/account_reconcilor.h

+++ b/chrome/browser/signin/account_reconcilor.h

@@ -8,6 +8,7 @@

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

+#include "chrome/browser/signin/google_auto_login_helper.h"

#include "components/browser_context_keyed_service/browser_context_keyed_service.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -126,6 +127,7 @@ class AccountReconcilor : public BrowserContextKeyedService,

Profile* profile_;

content::NotificationRegistrar registrar_;

base::RepeatingTimer<AccountReconcilor> reconciliation_timer_;

+ GoogleAutoLoginHelper merge_session_helper_;

bool registered_with_token_service_;

// Used during reconcile action.