Set version field when changes are made to enhanced bookmarks.

components/enhanced_bookmarks/bookmark_image_service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #ifndef COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_IMAGE_SERVICE_H_
 #define COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_IMAGE_SERVICE_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/enhanced_bookmarks/image_store.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "net/url_request/url_request.h"
 #include "url/gurl.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 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 enhanced bookmark model instead of
passing it as another argument?

[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();
 
   typedef base::Callback<void(const gfx::Image&, const GURL& url)> Callback;
 
   // 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
   // a URL for this salient image available.  The image (which may be empty) is
   // sent via the callback. The callback may be called synchronously if it is
@@ skipping 50 matching lines @@
       net::URLRequest::ReferrerPolicy referrer_policy,
       bool update_bookmark) = 0;
 
   // Retrieves a salient image for a given page_url by downloading the image in
   // one of the bookmark.
   virtual void RetrieveSalientImageForPageUrl(const GURL& page_url);
 
   // 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
   // network request if fetch_from_bookmark is false.
   void SalientImageForUrl(const GURL& page_url,
                           bool fetch_from_bookmark,
                           Callback stack_callback);
 
   // Processes the requests that have been waiting on an image.
   void ProcessRequests(const GURL& page_url,
@@ skipping 43 matching lines @@
   GURL previous_url_;
 
   // The worker pool to enqueue the store requests onto.
   scoped_refptr<base::SequencedWorkerPool> pool_;
   DISALLOW_COPY_AND_ASSIGN(BookmarkImageService);
 };
 
 }  // namespace enhanced_bookmarks
 
 #endif  // COMPONENTS_ENHANCED_BOOKMARKS_BOOKMARK_IMAGE_SERVICE_H_