| Index: components/sync/core_impl/js_sync_encryption_handler_observer.h
|
| diff --git a/sync/internal_api/js_sync_encryption_handler_observer.h b/components/sync/core_impl/js_sync_encryption_handler_observer.h
|
| similarity index 77%
|
| rename from sync/internal_api/js_sync_encryption_handler_observer.h
|
| rename to components/sync/core_impl/js_sync_encryption_handler_observer.h
|
| index 1c292042ffd8e5e9069adc820960aba892695285..6a0b1577a5384c5adc8613a8aed285649bdbdf93 100644
|
| --- a/sync/internal_api/js_sync_encryption_handler_observer.h
|
| +++ b/components/sync/core_impl/js_sync_encryption_handler_observer.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_INTERNAL_API_JS_SYNC_ENCRYPTION_HANDLER_OBSERVER_H_
|
| -#define SYNC_INTERNAL_API_JS_SYNC_ENCRYPTION_HANDLER_OBSERVER_H_
|
| +#ifndef COMPONENTS_SYNC_CORE_IMPL_JS_SYNC_ENCRYPTION_HANDLER_OBSERVER_H_
|
| +#define COMPONENTS_SYNC_CORE_IMPL_JS_SYNC_ENCRYPTION_HANDLER_OBSERVER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/sync_encryption_handler.h"
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| -#include "sync/protocol/sync_protocol_error.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/weak_handle.h"
|
| +#include "components/sync/core/sync_encryption_handler.h"
|
| +#include "components/sync/protocol/sync_protocol_error.h"
|
|
|
| namespace tracked_objects {
|
| class Location;
|
| @@ -50,7 +50,8 @@ class SYNC_EXPORT JsSyncEncryptionHandlerObserver
|
|
|
| private:
|
| void HandleJsEvent(const tracked_objects::Location& from_here,
|
| - const std::string& name, const JsEventDetails& details);
|
| + const std::string& name,
|
| + const JsEventDetails& details);
|
|
|
| WeakHandle<JsEventHandler> event_handler_;
|
|
|
| @@ -59,4 +60,4 @@ class SYNC_EXPORT JsSyncEncryptionHandlerObserver
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_JS_SYNC_ENCRYPTION_HANDLER_OBSERVER_H_
|
| +#endif // COMPONENTS_SYNC_CORE_IMPL_JS_SYNC_ENCRYPTION_HANDLER_OBSERVER_H_
|
|
|