| Index: components/sync/js/sync_js_controller.h
|
| diff --git a/sync/js/sync_js_controller.h b/components/sync/js/sync_js_controller.h
|
| similarity index 78%
|
| rename from sync/js/sync_js_controller.h
|
| rename to components/sync/js/sync_js_controller.h
|
| index cc325f1d70e028580a28becf9d214c4f47da6f77..13b757e70fe9d813a4a32873f434213ea8630dcc 100644
|
| --- a/sync/js/sync_js_controller.h
|
| +++ b/components/sync/js/sync_js_controller.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_JS_SYNC_JS_CONTROLLER_H_
|
| -#define SYNC_JS_SYNC_JS_CONTROLLER_H_
|
| +#ifndef COMPONENTS_SYNC_JS_SYNC_JS_CONTROLLER_H_
|
| +#define COMPONENTS_SYNC_JS_SYNC_JS_CONTROLLER_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -12,10 +12,10 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| -#include "sync/js/js_controller.h"
|
| -#include "sync/js/js_event_handler.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/weak_handle.h"
|
| +#include "components/sync/js/js_controller.h"
|
| +#include "components/sync/js/js_event_handler.h"
|
|
|
| namespace syncer {
|
|
|
| @@ -24,7 +24,8 @@ class JsBackend;
|
| // A class that mediates between the sync JsEventHandlers and the sync
|
| // JsBackend.
|
| class SYNC_EXPORT SyncJsController
|
| - : public JsController, public JsEventHandler,
|
| + : public JsController,
|
| + public JsEventHandler,
|
| public base::SupportsWeakPtr<SyncJsController> {
|
| public:
|
| SyncJsController();
|
| @@ -56,4 +57,4 @@ class SYNC_EXPORT SyncJsController
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_JS_SYNC_JS_CONTROLLER_H_
|
| +#endif // COMPONENTS_SYNC_JS_SYNC_JS_CONTROLLER_H_
|
|
|