| Index: components/sync/core/base_transaction.h
|
| diff --git a/sync/internal_api/public/base_transaction.h b/components/sync/core/base_transaction.h
|
| similarity index 77%
|
| rename from sync/internal_api/public/base_transaction.h
|
| rename to components/sync/core/base_transaction.h
|
| index 5002c727d9d9028a0c40f8f9088ba374e82ab914..dfd92c7456b2eb221545c3ae01cc46102b16d647 100644
|
| --- a/sync/internal_api/public/base_transaction.h
|
| +++ b/components/sync/core/base_transaction.h
|
| @@ -2,14 +2,14 @@
|
| // 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_BASE_TRANSACTION_H_
|
| -#define SYNC_INTERNAL_API_PUBLIC_BASE_TRANSACTION_H_
|
| +#ifndef COMPONENTS_SYNC_CORE_BASE_TRANSACTION_H_
|
| +#define COMPONENTS_SYNC_CORE_BASE_TRANSACTION_H_
|
|
|
| #include "base/macros.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/base/model_type.h"
|
| -#include "sync/internal_api/public/user_share.h"
|
| -#include "sync/util/cryptographer.h"
|
| +#include "components/sync/base/cryptographer.h"
|
| +#include "components/sync/base/model_type.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/core/user_share.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -43,15 +43,13 @@ class SYNC_EXPORT BaseTransaction {
|
| }
|
| }
|
|
|
| - UserShare* GetUserShare() const {
|
| - return user_share_;
|
| - }
|
| + UserShare* GetUserShare() const { return user_share_; }
|
|
|
| protected:
|
| explicit BaseTransaction(UserShare* share);
|
| virtual ~BaseTransaction();
|
|
|
| - BaseTransaction() : user_share_(NULL) { }
|
| + BaseTransaction() : user_share_(NULL) {}
|
|
|
| private:
|
| UserShare* user_share_;
|
| @@ -61,4 +59,4 @@ class SYNC_EXPORT BaseTransaction {
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_PUBLIC_BASE_TRANSACTION_H_
|
| +#endif // COMPONENTS_SYNC_CORE_BASE_TRANSACTION_H_
|
|
|