Index: components/sync/core/sync_encryption_handler.h |
diff --git a/sync/internal_api/public/sync_encryption_handler.h b/components/sync/core/sync_encryption_handler.h |
similarity index 89% |
rename from sync/internal_api/public/sync_encryption_handler.h |
rename to components/sync/core/sync_encryption_handler.h |
index 0edad2827325477ebe18ac9e3e640ca299add047..098c974f3e6fb08d5d311682bddd22e7846810b9 100644 |
--- a/sync/internal_api/public/sync_encryption_handler.h |
+++ b/components/sync/core/sync_encryption_handler.h |
@@ -2,15 +2,15 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_ |
-#define SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_ |
+#ifndef COMPONENTS_SYNC_CORE_SYNC_ENCRYPTION_HANDLER_H_ |
+#define COMPONENTS_SYNC_CORE_SYNC_ENCRYPTION_HANDLER_H_ |
#include <string> |
#include "base/time/time.h" |
-#include "sync/base/sync_export.h" |
-#include "sync/internal_api/public/base/model_type.h" |
-#include "sync/protocol/sync.pb.h" |
+#include "components/sync/base/model_type.h" |
+#include "components/sync/base/sync_export.h" |
+#include "components/sync/protocol/sync.pb.h" |
namespace syncer { |
@@ -33,11 +33,11 @@ enum PassphraseRequiredReason { |
// Do not re-order or delete these entries; they are used in a UMA histogram. |
// Please edit SyncPassphraseType in histograms.xml if a value is added. |
enum PassphraseType { |
- IMPLICIT_PASSPHRASE = 0, // GAIA-based passphrase (deprecated). |
- KEYSTORE_PASSPHRASE = 1, // Keystore passphrase. |
- FROZEN_IMPLICIT_PASSPHRASE = 2, // Frozen GAIA passphrase. |
- CUSTOM_PASSPHRASE = 3, // User-provided passphrase. |
- PASSPHRASE_TYPE_SIZE, // The size of this enum; keep last. |
+ IMPLICIT_PASSPHRASE = 0, // GAIA-based passphrase (deprecated). |
+ KEYSTORE_PASSPHRASE = 1, // Keystore passphrase. |
+ FROZEN_IMPLICIT_PASSPHRASE = 2, // Frozen GAIA passphrase. |
+ CUSTOM_PASSPHRASE = 3, // User-provided passphrase. |
+ PASSPHRASE_TYPE_SIZE, // The size of this enum; keep last. |
}; |
// Enum used to distinguish which bootstrap encryption token is being updated. |
@@ -86,9 +86,8 @@ class SYNC_EXPORT SyncEncryptionHandler { |
// the data is still encrypted with an older GAIA password. For accounts |
// with explicit passphrases, it will be the most recently seen custom |
// passphrase. |
- virtual void OnBootstrapTokenUpdated( |
- const std::string& bootstrap_token, |
- BootstrapTokenType type) = 0; |
+ virtual void OnBootstrapTokenUpdated(const std::string& bootstrap_token, |
+ BootstrapTokenType type) = 0; |
// Called when the set of encrypted types or the encrypt |
// everything flag has been changed. Note that encryption isn't |
@@ -102,9 +101,8 @@ class SYNC_EXPORT SyncEncryptionHandler { |
// Until this function is called, observers can assume that the |
// set of encrypted types is Cryptographer::SensitiveTypes() and |
// that the encrypt everything flag is false. |
- virtual void OnEncryptedTypesChanged( |
- ModelTypeSet encrypted_types, |
- bool encrypt_everything) = 0; |
+ virtual void OnEncryptedTypesChanged(ModelTypeSet encrypted_types, |
+ bool encrypt_everything) = 0; |
// Called after we finish encrypting the current set of encrypted |
// types. |
@@ -190,4 +188,4 @@ class SYNC_EXPORT SyncEncryptionHandler { |
} // namespace syncer |
-#endif // SYNC_INTERNAL_API_PUBLIC_SYNC_ENCRYPTION_HANDLER_H_ |
+#endif // COMPONENTS_SYNC_CORE_SYNC_ENCRYPTION_HANDLER_H_ |