chrome/browser/sync/profile_sync_service.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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/sync/profile_sync_service.cc

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc

index b4daa44e0b62a00dd12e111aae7f6f267baa9570..b649c14e32d39f0e7eb634bf6dd11cba7c4b9633 100644

--- a/chrome/browser/sync/profile_sync_service.cc

+++ b/chrome/browser/sync/profile_sync_service.cc

@@ -26,7 +26,8 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/defaults.h"

#include "chrome/browser/net/chrome_cookie_notification_details.h"

-#include "chrome/browser/prefs/pref_service.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

+#include "chrome/browser/prefs/pref_service_syncable.h"

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

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

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

@@ -137,7 +138,10 @@ ProfileSyncService::ProfileSyncService(ProfileSyncComponentsFactory* factory,

profile_(profile),

// |profile| may be NULL in unit tests.

sync_prefs_(profile_ ? profile_->GetPrefs() : NULL),

- invalidator_storage_(profile_ ? profile_->GetPrefs(): NULL),

+ invalidator_storage_(

+ profile_ ? profile_->GetPrefs(): NULL,

+ profile_ ? static_cast<PrefRegistrySyncable*>(

+ profile_->GetPrefs()->DeprecatedGetPrefRegistry()) : NULL),

sync_service_url_(kDevServerUrl),

is_first_time_sync_configure_(false),

backend_initialized_(false),