| Index: components/sync_bookmarks/bookmark_data_type_controller.h
|
| diff --git a/components/sync_bookmarks/bookmark_data_type_controller.h b/components/sync_bookmarks/bookmark_data_type_controller.h
|
| index d9b9689bb9c66c19eab1d6a079b43285af12282e..7e4abf7820ebdb1689d0e9b8de6392b39f481b37 100644
|
| --- a/components/sync_bookmarks/bookmark_data_type_controller.h
|
| +++ b/components/sync_bookmarks/bookmark_data_type_controller.h
|
| @@ -14,12 +14,13 @@
|
| #include "components/history/core/browser/history_service_observer.h"
|
| #include "components/sync/driver/frontend_data_type_controller.h"
|
|
|
| -namespace browser_sync {
|
| +namespace sync_bookmarks {
|
|
|
| // A class that manages the startup and shutdown of bookmark sync.
|
| -class BookmarkDataTypeController : public FrontendDataTypeController,
|
| - public bookmarks::BaseBookmarkModelObserver,
|
| - public history::HistoryServiceObserver {
|
| +class BookmarkDataTypeController
|
| + : public browser_sync::FrontendDataTypeController,
|
| + public bookmarks::BaseBookmarkModelObserver,
|
| + public history::HistoryServiceObserver {
|
| public:
|
| // |dump_stack| is called when an unrecoverable error occurs.
|
| BookmarkDataTypeController(const base::Closure& dump_stack,
|
| @@ -27,7 +28,7 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
|
| ~BookmarkDataTypeController() override;
|
|
|
| private:
|
| - // FrontendDataTypeController:
|
| + // browser_sync::FrontendDataTypeController:
|
| bool StartModels() override;
|
| void CleanUpState() override;
|
| void CreateSyncComponents() override;
|
| @@ -55,6 +56,6 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
|
| DISALLOW_COPY_AND_ASSIGN(BookmarkDataTypeController);
|
| };
|
|
|
| -} // namespace browser_sync
|
| +} // namespace sync_bookmarks
|
|
|
| #endif // COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_DATA_TYPE_CONTROLLER_H__
|
|
|