bookmarks: Move BookmarkModelObserver into 'bookmarks' namespace.

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 bookmarks::BookmarkModelObserver,
                              public base::NonThreadSafe {
  public:
   BookmarkImageService(const base::FilePath& path,
                        EnhancedBookmarkModel* enhanced_bookmark_model,
                        scoped_refptr<base::SequencedWorkerPool> pool);
   BookmarkImageService(scoped_ptr<ImageStore> store,
                        EnhancedBookmarkModel* enhanced_bookmark_model,
                        scoped_refptr<base::SequencedWorkerPool> pool);
 
   ~BookmarkImageService() override;
 
   typedef base::Callback<void(const gfx::Image&, const GURL& url)> Callback;
 
   // KeyedService:
   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
   // 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
   // possible. The callback is always triggered on the main thread.
   void SalientImageForUrl(const GURL& page_url, Callback callback);
 
-  // BookmarkModelObserver methods.
+  // bookmarks::BookmarkModelObserver:
   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,
@@ skipping 99 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_