chrome/browser/sync/profile_sync_service.cc - Issue 11441005: Create a fresh sync datatype for Synced Notifications

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 11441005: Create a fresh sync datatype for Synced Notifications (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix merge conflict in prolto_value_conversions.h Created 7 years, 12 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 ef237c28656965dde1d0ef5710896f1f9473ba03..aabef52ed85a745e063366d18353730bea6c5465 100644

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

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

@@ -1289,6 +1289,7 @@ void ProfileSyncService::UpdateSelectedTypesHistogram(

syncer::PASSWORDS,

syncer::PREFERENCES,

syncer::SESSIONS,

+ syncer::SYNCED_NOTIFICATIONS,

syncer::THEMES,

syncer::TYPED_URLS

};

@@ -1302,11 +1303,12 @@ void ProfileSyncService::UpdateSelectedTypesHistogram(

browser_sync::user_selectable_type::PASSWORDS,

browser_sync::user_selectable_type::PREFERENCES,

browser_sync::user_selectable_type::SESSIONS,

+ browser_sync::user_selectable_type::SYNCED_NOTIFICATIONS,

browser_sync::user_selectable_type::THEMES,

browser_sync::user_selectable_type::TYPED_URLS

};

- COMPILE_ASSERT(20 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);

+ COMPILE_ASSERT(21 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);

COMPILE_ASSERT(arraysize(model_types) ==

browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT,

UpdateCustomConfigHistogram);