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

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

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 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
Index: components/sync/syncable/model_type.cc
diff --git a/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
similarity index 94%
rename from sync/syncable/model_type.cc
rename to components/sync/syncable/model_type.cc
index bb5e0fa3cece28d32cdda34a486fd048b6971e28..51ba9ed857837c6dd715f8323baa8cea77c2e4ff 100644
--- a/sync/syncable/model_type.cc
+++ b/components/sync/syncable/model_type.cc
@@ -2,29 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/internal_api/public/base/model_type.h"
+#include "components/sync/base/model_type.h"
#include <stddef.h>
#include "base/macros.h"
#include "base/strings/string_split.h"
#include "base/values.h"
-#include "sync/protocol/app_notification_specifics.pb.h"
-#include "sync/protocol/app_setting_specifics.pb.h"
-#include "sync/protocol/app_specifics.pb.h"
-#include "sync/protocol/autofill_specifics.pb.h"
-#include "sync/protocol/bookmark_specifics.pb.h"
-#include "sync/protocol/extension_setting_specifics.pb.h"
-#include "sync/protocol/extension_specifics.pb.h"
-#include "sync/protocol/nigori_specifics.pb.h"
-#include "sync/protocol/password_specifics.pb.h"
-#include "sync/protocol/preference_specifics.pb.h"
-#include "sync/protocol/search_engine_specifics.pb.h"
-#include "sync/protocol/session_specifics.pb.h"
-#include "sync/protocol/sync.pb.h"
-#include "sync/protocol/theme_specifics.pb.h"
-#include "sync/protocol/typed_url_specifics.pb.h"
-#include "sync/syncable/syncable_proto_util.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"
+#include "components/sync/protocol/autofill_specifics.pb.h"
+#include "components/sync/protocol/bookmark_specifics.pb.h"
+#include "components/sync/protocol/extension_setting_specifics.pb.h"
+#include "components/sync/protocol/extension_specifics.pb.h"
+#include "components/sync/protocol/nigori_specifics.pb.h"
+#include "components/sync/protocol/password_specifics.pb.h"
+#include "components/sync/protocol/preference_specifics.pb.h"
+#include "components/sync/protocol/search_engine_specifics.pb.h"
+#include "components/sync/protocol/session_specifics.pb.h"
+#include "components/sync/protocol/sync.pb.h"
+#include "components/sync/protocol/theme_specifics.pb.h"
+#include "components/sync/protocol/typed_url_specifics.pb.h"
+#include "components/sync/syncable/syncable_proto_util.h"
namespace syncer {
@@ -69,8 +69,8 @@ const ModelTypeInfo kModelTypeInfoMap[] = {
{AUTOFILL_WALLET_DATA, "AUTOFILL_WALLET", "autofill_wallet",
"Autofill Wallet", sync_pb::EntitySpecifics::kAutofillWalletFieldNumber,
34},
- {AUTOFILL_WALLET_METADATA, "WALLET_METADATA",
- "autofill_wallet_metadata", "Autofill Wallet Metadata",
+ {AUTOFILL_WALLET_METADATA, "WALLET_METADATA", "autofill_wallet_metadata",
+ "Autofill Wallet Metadata",
sync_pb::EntitySpecifics::kWalletMetadataFieldNumber, 35},
{THEMES, "THEME", "themes", "Themes",
sync_pb::EntitySpecifics::kThemeFieldNumber, 7},
@@ -149,15 +149,8 @@ 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", "tabs",
};
static_assert(
@@ -681,8 +674,8 @@ std::unique_ptr<base::ListValue> ModelTypeSetToValue(ModelTypeSet model_types) {
ModelTypeSet ModelTypeSetFromValue(const base::ListValue& value) {
ModelTypeSet result;
- for (base::ListValue::const_iterator i = value.begin();
- i != value.end(); ++i) {
+ for (base::ListValue::const_iterator i = value.begin(); i != value.end();
+ ++i) {
result.Put(ModelTypeFromValue(**i));
}
return result;
« no previous file with comments | « components/sync/syncable/model_neutral_mutable_entry.cc ('k') | components/sync/syncable/model_type_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698