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

Unified Diff: components/sync/syncable/entry.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
« no previous file with comments | « components/sync/syncable/entry.h ('k') | components/sync/syncable/entry_kernel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/entry.cc
diff --git a/sync/syncable/entry.cc b/components/sync/syncable/entry.cc
similarity index 91%
rename from sync/syncable/entry.cc
rename to components/sync/syncable/entry.cc
index 176178463bce3eb484504743c7a226c2c1734dfc..078587a02d88a50c60e35d3a1fcce67630250ffc 100644
--- a/sync/syncable/entry.cc
+++ b/components/sync/syncable/entry.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/syncable/entry.h"
+#include "components/sync/syncable/entry.h"
#include <stdint.h>
#include <iomanip>
-#include "sync/syncable/directory.h"
-#include "sync/syncable/syncable_base_transaction.h"
+#include "components/sync/syncable/directory.h"
+#include "components/sync/syncable/syncable_base_transaction.h"
namespace syncer {
namespace syncable {
@@ -49,8 +49,7 @@ base::DictionaryValue* Entry::ToValue(Cryptographer* cryptographer) const {
entry_info->SetBoolean("good", good());
if (good()) {
entry_info->Set("kernel", kernel_->ToValue(cryptographer));
- entry_info->Set("modelType",
- ModelTypeToValue(GetModelType()));
+ entry_info->Set("modelType", ModelTypeToValue(GetModelType()));
entry_info->SetBoolean("existsOnClientBecauseNameIsNonEmpty",
ExistsOnClientBecauseNameIsNonEmpty());
entry_info->SetBoolean("isRoot", IsRoot());
@@ -59,13 +58,13 @@ base::DictionaryValue* Entry::ToValue(Cryptographer* cryptographer) const {
}
bool Entry::GetSyncing() const {
- DCHECK(kernel_);
- return kernel_->ref(SYNCING);
+ DCHECK(kernel_);
+ return kernel_->ref(SYNCING);
}
bool Entry::GetDirtySync() const {
- DCHECK(kernel_);
- return kernel_->ref(DIRTY_SYNC);
+ DCHECK(kernel_);
+ return kernel_->ref(DIRTY_SYNC);
}
ModelType Entry::GetServerModelType() const {
« no previous file with comments | « components/sync/syncable/entry.h ('k') | components/sync/syncable/entry_kernel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698