diff options
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_model.h')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 91cd1c8..7ec957c 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -21,6 +21,7 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_registrar.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -192,19 +193,18 @@ class BookmarkPermanentNode : public BookmarkNode { // An observer may be attached to observe relevant events. // // You should NOT directly create a BookmarkModel, instead go through the -// Profile. +// BookmarkModelFactory. class BookmarkModel : public content::NotificationObserver, - public BookmarkService { + public BookmarkService, + public ProfileKeyedService { public: explicit BookmarkModel(Profile* profile); virtual ~BookmarkModel(); - static void RegisterUserPrefs(PrefService* prefs); - // Invoked prior to destruction to release any necessary resources. - void Cleanup(); + virtual void Shutdown() OVERRIDE; - // Loads the bookmarks. This is called by Profile upon creation of the + // Loads the bookmarks. This is called upon creation of the // BookmarkModel. You need not invoke this directly. void Load(); |