chrome/browser/sync/profile_sync_service_model_type_selection_android.h - Issue 13109002: [Sync] Move Android enabled types logic into native

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_model_type_selection_android.h

Issue 13109002: [Sync] Move Android enabled types logic into native (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Created 7 years, 9 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/profile_sync_service_android.cc ('k') | sync/android/java/src/org/chromium/sync/internal_api/pub/base/ModelType.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_model_type_selection_android.h

diff --git a/chrome/browser/sync/profile_sync_service_model_type_selection_android.h b/chrome/browser/sync/profile_sync_service_model_type_selection_android.h

index 3628596c873092b3fc44294818775fecbfc5b9a2..822814d7745263744431cdd8092209f919e36b5b 100644

--- a/chrome/browser/sync/profile_sync_service_model_type_selection_android.h

+++ b/chrome/browser/sync/profile_sync_service_model_type_selection_android.h

@@ -5,15 +5,31 @@

// This file intentionally does not have header guards, it's included

// inside a macro to generate enum.

-// This file contains the list of sync ModelTypes that Android can select as

-// preferred types.

+// This file contains the list of sync ModelTypes that Android can register for

+// invalidations for.

-DEFINE_MODEL_TYPE_SELECTION(AUTOFILL, 1)

+DEFINE_MODEL_TYPE_SELECTION(AUTOFILL, 1<<0)

-DEFINE_MODEL_TYPE_SELECTION(BOOKMARK, 2)

+DEFINE_MODEL_TYPE_SELECTION(BOOKMARK, 1<<1)

-DEFINE_MODEL_TYPE_SELECTION(PASSWORD, 4)

+DEFINE_MODEL_TYPE_SELECTION(PASSWORD, 1<<2)

-DEFINE_MODEL_TYPE_SELECTION(SESSION, 8)

+DEFINE_MODEL_TYPE_SELECTION(SESSION, 1<<3)

-DEFINE_MODEL_TYPE_SELECTION(TYPED_URL, 16)

+DEFINE_MODEL_TYPE_SELECTION(TYPED_URL, 1<<4)

+DEFINE_MODEL_TYPE_SELECTION(AUTOFILL_PROFILE, 1<<5)

+DEFINE_MODEL_TYPE_SELECTION(HISTORY_DELETE_DIRECTIVE, 1<<6)

+DEFINE_MODEL_TYPE_SELECTION(PROXY_TABS, 1<<7)

+DEFINE_MODEL_TYPE_SELECTION(FAVICON_IMAGE, 1<<8)

+DEFINE_MODEL_TYPE_SELECTION(FAVICON_TRACKING, 1<<9)

+DEFINE_MODEL_TYPE_SELECTION(NIGORI, 1<<10)

+DEFINE_MODEL_TYPE_SELECTION(DEVICE_INFO, 1<<11)

+DEFINE_MODEL_TYPE_SELECTION(EXPERIMENTS, 1<<12)