| 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 67abac7e6d25d65b623826b9720f108d9c48b37d..8b36b704405573893f0a56245b54c3099465d3df 100644
|
| --- a/components/enhanced_bookmarks/bookmark_image_service.h
|
| +++ b/components/enhanced_bookmarks/bookmark_image_service.h
|
| @@ -34,12 +34,12 @@ class BookmarkImageService : public KeyedService,
|
| EnhancedBookmarkModel* enhanced_bookmark_model,
|
| scoped_refptr<base::SequencedWorkerPool> pool);
|
|
|
| - virtual ~BookmarkImageService();
|
| + ~BookmarkImageService() override;
|
|
|
| typedef base::Callback<void(const gfx::Image&, const GURL& url)> Callback;
|
|
|
| // KeyedService:
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
|
|
| // Returns a salient image for a URL. This may trigger a network request for
|
| // the image if the image was not retrieved before and if a bookmark node has
|
| @@ -49,32 +49,30 @@ class BookmarkImageService : public KeyedService,
|
| void SalientImageForUrl(const GURL& page_url, Callback callback);
|
|
|
| // BookmarkModelObserver methods.
|
| - virtual void BookmarkNodeRemoved(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int old_index,
|
| - const BookmarkNode* node,
|
| + void BookmarkNodeRemoved(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int old_index,
|
| + const BookmarkNode* node,
|
| + const std::set<GURL>& removed_urls) override;
|
| + void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
|
| + void BookmarkNodeMoved(BookmarkModel* model,
|
| + const BookmarkNode* old_parent,
|
| + int old_index,
|
| + const BookmarkNode* new_parent,
|
| + int new_index) override;
|
| + void BookmarkNodeAdded(BookmarkModel* model,
|
| + const BookmarkNode* parent,
|
| + int index) override;
|
| + void OnWillChangeBookmarkNode(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkAllUserNodesRemoved(BookmarkModel* model,
|
| const std::set<GURL>& removed_urls) override;
|
| - virtual void BookmarkModelLoaded(BookmarkModel* model,
|
| - bool ids_reassigned) override;
|
| - virtual void BookmarkNodeMoved(BookmarkModel* model,
|
| - const BookmarkNode* old_parent,
|
| - int old_index,
|
| - const BookmarkNode* new_parent,
|
| - int new_index) override;
|
| - virtual void BookmarkNodeAdded(BookmarkModel* model,
|
| - const BookmarkNode* parent,
|
| - int index) override;
|
| - virtual void OnWillChangeBookmarkNode(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkAllUserNodesRemoved(
|
| - BookmarkModel* model,
|
| - const std::set<GURL>& removed_urls) override;
|
|
|
| protected:
|
| // Returns true if the image for the page_url is currently being fetched.
|
|
|