chrome/browser/sync/glue/sync_backend_registrar.cc - Issue 839193002: Move ServiceAccessType into //components/keyed_service

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/sync/glue/sync_backend_registrar.cc

Issue 839193002: Move ServiceAccessType into //components/keyed_service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compilation on android Created 5 years, 11 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/glue/password_data_type_controller.cc ('k') | chrome/browser/sync/glue/typed_url_data_type_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/sync_backend_registrar.cc

diff --git a/chrome/browser/sync/glue/sync_backend_registrar.cc b/chrome/browser/sync/glue/sync_backend_registrar.cc

index 97fa4efcba2a084bbc949a9143fd039c56d2d7fd..92984af498a4d20c62e8bf6454ef11461918781d 100644

--- a/chrome/browser/sync/glue/sync_backend_registrar.cc

+++ b/chrome/browser/sync/glue/sync_backend_registrar.cc

@@ -94,8 +94,8 @@ SyncBackendRegistrar::SyncBackendRegistrar(

// TODO(pavely): Remove ScopedTracker below once crbug.com/426272 is fixed.

tracked_objects::ScopedTracker tracker2(FROM_HERE_WITH_EXPLICIT_FUNCTION(

"426272 SyncBackendRegistrar::ctor history"));

- HistoryService* history_service =

- HistoryServiceFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);

+ HistoryService* history_service = HistoryServiceFactory::GetForProfile(

+ profile, ServiceAccessType::IMPLICIT_ACCESS);

if (history_service) {

workers_[syncer::GROUP_HISTORY] =

new HistoryModelWorker(history_service->AsWeakPtr(), this);

@@ -107,7 +107,8 @@ SyncBackendRegistrar::SyncBackendRegistrar(

tracked_objects::ScopedTracker tracker3(FROM_HERE_WITH_EXPLICIT_FUNCTION(

"426272 SyncBackendRegistrar::ctor passwords"));

scoped_refptr<password_manager::PasswordStore> password_store =

- PasswordStoreFactory::GetForProfile(profile, Profile::IMPLICIT_ACCESS);

+ PasswordStoreFactory::GetForProfile(profile,

+ ServiceAccessType::IMPLICIT_ACCESS);

if (password_store.get()) {

workers_[syncer::GROUP_PASSWORD] =

new PasswordModelWorker(password_store, this);