ios/chrome/browser/sync/sync_setup_service.h - Issue 2064183002: Reland: "Sync: Support multiple setup UIs."

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: ios/chrome/browser/sync/sync_setup_service.h

Issue 2064183002: Reland: "Sync: Support multiple setup UIs." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 0183-settings-sync-rel… Created 4 years, 6 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: ios/chrome/browser/sync/sync_setup_service.h

diff --git a/ios/chrome/browser/sync/sync_setup_service.h b/ios/chrome/browser/sync/sync_setup_service.h

index 0df68223dae03f884aada93252930997c2a88038..34d87e4aaba43e8149a4b3171940dcb8379b8025 100644

--- a/ios/chrome/browser/sync/sync_setup_service.h

+++ b/ios/chrome/browser/sync/sync_setup_service.h

@@ -15,6 +15,7 @@

namespace sync_driver {

class SyncService;

+class SyncSetupInProgressHandle;

}

class PrefService;

@@ -105,6 +106,9 @@ class SyncSetupService : public KeyedService {

PrefService* const prefs_;

syncer::ModelTypeSet user_selectable_types_;

+ // Prevents Sync from running until configuration is complete.

+ std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;

DISALLOW_COPY_AND_ASSIGN(SyncSetupService);

};