summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorMike Wittman <wittman@chromium.org>2014-10-01 14:56:57 -0700
committerMike Wittman <wittman@chromium.org>2014-10-01 21:59:55 +0000
commit72520cfbda25e457da26113b568c76171d716a3f (patch)
treeada572d1f49255980811a20eb452a7f7e6423d6b /components
parent438a0d63964342acd2b50f12cb69fa4ae93254c0 (diff)
downloadchromium_src-72520cfbda25e457da26113b568c76171d716a3f.zip
chromium_src-72520cfbda25e457da26113b568c76171d716a3f.tar.gz
chromium_src-72520cfbda25e457da26113b568c76171d716a3f.tar.bz2
Add enhanced bookmarks sync datatype
Adds a new sync datatype to handle the enhanced bookmarks representation. BUG=415822 R=mpearson@chromium.org, sky@chromium.org, zea@chromium.org Review URL: https://codereview.chromium.org/583863002 Cr-Commit-Position: refs/heads/master@{#297718}
Diffstat (limited to 'components')
-rw-r--r--components/sync_driver/model_association_manager.cc1
-rw-r--r--components/sync_driver/pref_names.cc1
-rw-r--r--components/sync_driver/pref_names.h1
-rw-r--r--components/sync_driver/sync_prefs.cc2
4 files changed, 5 insertions, 0 deletions
diff --git a/components/sync_driver/model_association_manager.cc b/components/sync_driver/model_association_manager.cc
index 6706c4c..2fa90ab 100644
--- a/components/sync_driver/model_association_manager.cc
+++ b/components/sync_driver/model_association_manager.cc
@@ -39,6 +39,7 @@ static const syncer::ModelType kStartOrder[] = {
// UI thread data types.
syncer::BOOKMARKS,
+ syncer::ENHANCED_BOOKMARKS,
syncer::SUPERVISED_USERS, // Syncing supervised users on initial login
// might block creating a new supervised user,
// so we want to do it early.
diff --git a/components/sync_driver/pref_names.cc b/components/sync_driver/pref_names.cc
index 5ecf5c8..bf3de10 100644
--- a/components/sync_driver/pref_names.cc
+++ b/components/sync_driver/pref_names.cc
@@ -40,6 +40,7 @@ const char kSyncAutofill[] = "sync.autofill";
const char kSyncBookmarks[] = "sync.bookmarks";
const char kSyncDeviceInfo[] = "sync.device_info";
const char kSyncDictionary[] = "sync.dictionary";
+const char kSyncEnhancedBookmarks[] = "sync.enhanced_bookmarks";
const char kSyncExtensionSettings[] = "sync.extension_settings";
const char kSyncExtensions[] = "sync.extensions";
const char kSyncFaviconImages[] = "sync.favicon_images";
diff --git a/components/sync_driver/pref_names.h b/components/sync_driver/pref_names.h
index 54710fb..a386504 100644
--- a/components/sync_driver/pref_names.h
+++ b/components/sync_driver/pref_names.h
@@ -28,6 +28,7 @@ extern const char kSyncAutofill[];
extern const char kSyncBookmarks[];
extern const char kSyncDeviceInfo[];
extern const char kSyncDictionary[];
+extern const char kSyncEnhancedBookmarks[];
extern const char kSyncExtensionSettings[];
extern const char kSyncExtensions[];
extern const char kSyncFaviconImages[];
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc
index cc7914d..c28ec27 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync_driver/sync_prefs.cc
@@ -301,6 +301,8 @@ const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) {
return prefs::kSyncThemes;
case syncer::TYPED_URLS:
return prefs::kSyncTypedUrls;
+ case syncer::ENHANCED_BOOKMARKS:
+ return prefs::kSyncEnhancedBookmarks;
case syncer::EXTENSION_SETTINGS:
return prefs::kSyncExtensionSettings;
case syncer::EXTENSIONS: