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

Unified Diff: components/sync/syncable/nigori_handler.h

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/mutable_entry.cc ('k') | components/sync/syncable/nigori_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/nigori_handler.h
diff --git a/sync/syncable/nigori_handler.h b/components/sync/syncable/nigori_handler.h
similarity index 80%
rename from sync/syncable/nigori_handler.h
rename to components/sync/syncable/nigori_handler.h
index b337daff8fcab852a881447f9974796e70ce6634..04ab29add849687d03720ee66ab645c1c667e6b7 100644
--- a/sync/syncable/nigori_handler.h
+++ b/components/sync/syncable/nigori_handler.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SYNC_SYNCABLE_NIGORI_HANDLER_H_
-#define SYNC_SYNCABLE_NIGORI_HANDLER_H_
+#ifndef COMPONENTS_SYNC_SYNCABLE_NIGORI_HANDLER_H_
+#define COMPONENTS_SYNC_SYNCABLE_NIGORI_HANDLER_H_
#include <string>
-#include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/model_type.h"
+#include "components/sync/base/model_type.h"
+#include "components/sync/base/sync_export.h"
namespace google {
namespace protobuf {
@@ -36,9 +36,8 @@ class SYNC_EXPORT NigoriHandler {
// Apply a nigori node update, updating the internal encryption state
// accordingly.
- virtual void ApplyNigoriUpdate(
- const sync_pb::NigoriSpecifics& nigori,
- syncable::BaseTransaction* const trans) = 0;
+ virtual void ApplyNigoriUpdate(const sync_pb::NigoriSpecifics& nigori,
+ syncable::BaseTransaction* const trans) = 0;
// Store the current encrypt everything/encrypted types state into |nigori|.
virtual void UpdateNigoriFromEncryptedTypes(
@@ -63,4 +62,4 @@ class SYNC_EXPORT NigoriHandler {
} // namespace syncable
} // namespace syncer
-#endif // SYNC_SYNCABLE_NIGORI_HANDLER_H_
+#endif // COMPONENTS_SYNC_SYNCABLE_NIGORI_HANDLER_H_
« no previous file with comments | « components/sync/syncable/mutable_entry.cc ('k') | components/sync/syncable/nigori_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698