chrome/browser/chromeos/login/screen_locker.cc - Issue 9169096: Remove a bunch of GetProfileSyncService callers to use the new factory.

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/chromeos/login/screen_locker.cc

Issue 9169096: Remove a bunch of GetProfileSyncService callers to use the new factory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rm todos Created 8 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:

Index: chrome/browser/chromeos/login/screen_locker.cc

diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc

index cb624e65d728f13a3654436063c18ca07102b07b..0cefd3b8126635fc62866bfa6970c4163014835b 100644

--- a/chrome/browser/chromeos/login/screen_locker.cc

+++ b/chrome/browser/chromeos/login/screen_locker.cc

@@ -32,6 +32,7 @@

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/signin/signin_manager.h"

#include "chrome/browser/sync/profile_sync_service.h"

+#include "chrome/browser/sync/profile_sync_service_factory.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/browser_window.h"

@@ -264,7 +265,8 @@ void ScreenLocker::OnLoginSuccess(

Profile* profile = ProfileManager::GetDefaultProfile();

if (profile) {

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

+ ProfileSyncService* service(

+ ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));

if (service && !service->HasSyncSetupCompleted()) {

// If sync has failed somehow, try setting the sync passphrase here.

service->SetPassphrase(password, false);