| Index: chrome/browser/sync/glue/bookmark_data_type_controller.h
|
| diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller.h b/chrome/browser/sync/glue/bookmark_data_type_controller.h
|
| index c16c409410f0286f9569548442f65e5739fe9bfb..7fd4da6001f0d0e4d8f25f3940c6fa4436fa2fc4 100644
|
| --- a/chrome/browser/sync/glue/bookmark_data_type_controller.h
|
| +++ b/chrome/browser/sync/glue/bookmark_data_type_controller.h
|
| @@ -8,17 +8,17 @@
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| +#include "base/scoped_observer.h"
|
| #include "chrome/browser/sync/glue/frontend_data_type_controller.h"
|
| #include "components/bookmarks/browser/base_bookmark_model_observer.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| -#include "content/public/browser/notification_registrar.h"
|
| +#include "components/history/core/browser/history_service_observer.h"
|
|
|
| namespace browser_sync {
|
|
|
| // A class that manages the startup and shutdown of bookmark sync.
|
| class BookmarkDataTypeController : public FrontendDataTypeController,
|
| - public content::NotificationObserver,
|
| - public BaseBookmarkModelObserver {
|
| + public BaseBookmarkModelObserver,
|
| + public history::HistoryServiceObserver {
|
| public:
|
| BookmarkDataTypeController(ProfileSyncComponentsFactory* profile_sync_factory,
|
| Profile* profile,
|
| @@ -27,10 +27,8 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
|
| // FrontendDataTypeController interface.
|
| syncer::ModelType type() const override;
|
|
|
| - // content::NotificationObserver interface.
|
| - void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + // history::HistoryServiceObserver:
|
| + void OnHistoryServiceLoaded(HistoryService* service) override;
|
|
|
| private:
|
| ~BookmarkDataTypeController() override;
|
| @@ -49,8 +47,6 @@ class BookmarkDataTypeController : public FrontendDataTypeController,
|
| // service have finished loading.
|
| bool DependentsLoaded();
|
|
|
| - content::NotificationRegistrar registrar_;
|
| -
|
| BookmarkModel* bookmark_model_;
|
|
|
| // Have we installed ourselves as a BookmarkModel observer?
|
|
|