| Index: components/bookmarks/browser/bookmark_model.h
|
| diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
|
| index 9c4d8c41872cef3fea06250585aaac715933bb36..febe87017b6472b1637047e8c1deb13fb285d269 100644
|
| --- a/components/bookmarks/browser/bookmark_model.h
|
| +++ b/components/bookmarks/browser/bookmark_model.h
|
| @@ -19,6 +19,7 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "components/bookmarks/browser/bookmark_client.h"
|
| #include "components/bookmarks/browser/bookmark_node.h"
|
| +#include "components/keyed_service/core/keyed_service.h"
|
| #include "ui/gfx/image/image.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -58,7 +59,7 @@ class TestBookmarkClient;
|
| //
|
| // You should NOT directly create a BookmarkModel, instead go through the
|
| // BookmarkModelFactory.
|
| -class BookmarkModel {
|
| +class BookmarkModel : public KeyedService {
|
| public:
|
| struct URLAndTitle {
|
| GURL url;
|
| @@ -68,10 +69,10 @@ class BookmarkModel {
|
| // |index_urls| says whether URLs should be stored in the BookmarkIndex
|
| // in addition to bookmark titles.
|
| BookmarkModel(BookmarkClient* client, bool index_urls);
|
| - ~BookmarkModel();
|
| + virtual ~BookmarkModel();
|
|
|
| - // Invoked prior to destruction to release any necessary resources.
|
| - void Shutdown();
|
| + // KeyedService:
|
| + virtual void Shutdown() OVERRIDE;
|
|
|
| // Loads the bookmarks. This is called upon creation of the
|
| // BookmarkModel. You need not invoke this directly.
|
|
|