Chromium Code Reviews| Index: components/enhanced_bookmarks/bookmark_image_service.h |
| diff --git a/components/enhanced_bookmarks/bookmark_image_service.h b/components/enhanced_bookmarks/bookmark_image_service.h |
| index 6ca75eb4e39c97e7dc6b5e44b4446a763d7c33da..bf2f59025f8008eb2a55d50dde2abc5e257f675a 100644 |
| --- a/components/enhanced_bookmarks/bookmark_image_service.h |
| +++ b/components/enhanced_bookmarks/bookmark_image_service.h |
| @@ -20,16 +20,20 @@ class BookmarkNode; |
| namespace enhanced_bookmarks { |
| +class EnhancedBookmarkModel; |
| + |
| // The BookmarkImageService stores salient images for bookmarks. |
| class BookmarkImageService : public KeyedService, |
| public BookmarkModelObserver, |
| public base::NonThreadSafe { |
| public: |
| - explicit BookmarkImageService(const base::FilePath& path, |
| - BookmarkModel* bookmark_model, |
| - scoped_refptr<base::SequencedWorkerPool> pool); |
| + BookmarkImageService(const base::FilePath& path, |
| + BookmarkModel* bookmark_model, |
| + EnhancedBookmarkModel* enhanced_bookmark_model, |
|
noyau (Ping after 24h)
2014/09/05 12:04:43
Can't we access the bookmark_model inside the enha
Rune Fevang
2014/09/06 00:01:56
Done.
|
| + scoped_refptr<base::SequencedWorkerPool> pool); |
| BookmarkImageService(scoped_ptr<ImageStore> store, |
| BookmarkModel* bookmark_model, |
| + EnhancedBookmarkModel* enhanced_bookmark_model, |
| scoped_refptr<base::SequencedWorkerPool> pool); |
| virtual ~BookmarkImageService(); |
| @@ -100,8 +104,9 @@ class BookmarkImageService : public KeyedService, |
| // PageUrls currently in the progress of being retrieved. |
| std::set<GURL> in_progress_page_urls_; |
| - // Cached pointer to the bookmarks model. |
| + // Cached pointers to the bookmark models. |
| BookmarkModel* bookmark_model_; // weak |
| + EnhancedBookmarkModel* enhanced_bookmark_model_; |
| private: |
| // Same as SalientImageForUrl(const GURL&, Callback) but can prevent the |