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

Unified Diff: components/sync/syncable/syncable_proto_util.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/syncable_proto_util.cc
diff --git a/sync/syncable/syncable_proto_util.cc b/components/sync/syncable/syncable_proto_util.cc
similarity index 76%
rename from sync/syncable/syncable_proto_util.cc
rename to components/sync/syncable/syncable_proto_util.cc
index 4f35b1930e57ac1e03bc7d84efe0e063d19e7fe1..9464399a43727d04d4952cc2026d0c610b119f1e 100644
--- a/sync/syncable/syncable_proto_util.cc
+++ b/components/sync/syncable/syncable_proto_util.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "sync/syncable/syncable_proto_util.h"
+#include "components/sync/syncable/syncable_proto_util.h"
-#include "sync/protocol/sync.pb.h"
+#include "components/sync/protocol/sync.pb.h"
namespace syncer {
@@ -20,9 +20,9 @@ bool IsFolder(const sync_pb::SyncEntity& entity) {
// TODO(sync): The checks for has_folder() and has_bookmarkdata() are likely
// no longer necessary. We should remove them if we can convince ourselves
// that doing so won't break anything.
- return ((entity.has_folder() && entity.folder()) ||
- (entity.has_bookmarkdata() &&
- entity.bookmarkdata().bookmark_folder()));
+ return (
+ (entity.has_folder() && entity.folder()) ||
+ (entity.has_bookmarkdata() && entity.bookmarkdata().bookmark_folder()));
}
bool IsRoot(const sync_pb::SyncEntity& entity) {
« no previous file with comments | « components/sync/syncable/syncable_proto_util.h ('k') | components/sync/syncable/syncable_read_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698