Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: components/sync/syncable/model_type.cc

Issue 2548413002: Fix sync for reading list (Closed)
Patch Set: Update DEPS Created 4 years 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 | « components/sync/syncable/DEPS ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/model_type.cc
diff --git a/components/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
index d256055fcc8e63cab1b1729f751c2cdd65ecdc80..a4d34f19a63f44ad37423129f479115dd3a8fe75 100644
--- a/components/sync/syncable/model_type.cc
+++ b/components/sync/syncable/model_type.cc
@@ -9,6 +9,7 @@
#include "base/macros.h"
#include "base/strings/string_split.h"
#include "base/values.h"
+#include "components/reading_list/core/reading_list_enable_flags.h"
#include "components/sync/protocol/app_notification_specifics.pb.h"
#include "components/sync/protocol/app_setting_specifics.pb.h"
#include "components/sync/protocol/app_specifics.pb.h"
@@ -154,8 +155,12 @@ static_assert(arraysize(kModelTypeInfoMap) == MODEL_TYPE_COUNT,
// 2) This list must be in the same order as the respective values in the
// ModelType enum.
const char* kUserSelectableDataTypeNames[] = {
- "bookmarks", "preferences", "passwords", "autofill", "themes",
- "typedUrls", "extensions", "apps", "tabs",
+ "bookmarks", "preferences", "passwords", "autofill",
+ "themes", "typedUrls", "extensions", "apps",
+#if BUILDFLAG(ENABLE_READING_LIST)
+ "readingList",
+#endif
+ "tabs",
};
static_assert(
@@ -476,6 +481,9 @@ ModelTypeSet UserSelectableTypes() {
set.Put(TYPED_URLS);
set.Put(EXTENSIONS);
set.Put(APPS);
+#if BUILDFLAG(ENABLE_READING_LIST)
+ set.Put(READING_LIST);
+#endif
set.Put(PROXY_TABS);
return set;
}
« no previous file with comments | « components/sync/syncable/DEPS ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698