bookmarks: Move BaseBookmarkModelObserver into 'bookmarks' namespace.

chrome/browser/android/bookmarks/bookmarks_bridge.h

 // Copyright 2013 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 CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
 #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/common/android/bookmark_id.h"
 
 namespace bookmarks {
 class ScopedGroupBookmarkActions;
 }
 
 class Profile;
 
 // The delegate to fetch bookmarks information for the Android native
 // bookmark page. This fetches the bookmarks, title, urls, folder
 // hierarchy.
-class BookmarksBridge : public BaseBookmarkModelObserver,
+class BookmarksBridge : public bookmarks::BaseBookmarkModelObserver,
                         public PartnerBookmarksShim::Observer {
  public:
   BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile);
   void Destroy(JNIEnv*, jobject);
 
   static bool RegisterBookmarksBridge(JNIEnv* env);
 
   bool IsDoingExtensiveChanges(JNIEnv* env, jobject obj);
 
   void LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env, jobject obj);
@@ skipping 129 matching lines @@
   bool IsEditable(const BookmarkNode* node) const;
   // Returns whether |node| is a managed bookmark.
   bool IsManaged(const BookmarkNode* node) const;
   const BookmarkNode* GetParentNode(const BookmarkNode* node);
   int GetBookmarkType(const BookmarkNode* node);
   bool IsReachable(const BookmarkNode* node) const;
   bool IsLoaded() const;
   bool IsFolderAvailable(const BookmarkNode* folder) const;
   void NotifyIfDoneLoading();
 
-  // Override BaseBookmarkModelObserver.
+  // Override bookmarks::BaseBookmarkModelObserver.
   // Called when there are changes to the bookmark model that don't trigger
   // any of the other callback methods. For example, this is called when
   // partner bookmarks change.
   virtual void BookmarkModelChanged() override;
   virtual void BookmarkModelLoaded(BookmarkModel* model,
                                    bool ids_reassigned) override;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
@@ skipping 26 matching lines @@
   scoped_ptr<bookmarks::ScopedGroupBookmarkActions> grouped_bookmark_actions_;
 
   // Information about the Partner bookmarks (must check for IsLoaded()).
   // This is owned by profile.
   PartnerBookmarksShim* partner_bookmarks_shim_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarksBridge);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_