bookmarks: Move BookmarkNode into 'bookmarks' namespace.

chrome/browser/android/bookmarks/partner_bookmarks_shim.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_PARTNER_BOOKMARKS_SHIM_H_
 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 35 matching lines @@
   static void DisablePartnerBookmarksEditing();
 
   // Returns true if everything got loaded.
   bool IsLoaded() const;
 
   // Returns true if there are partner bookmarks.
   bool HasPartnerBookmarks() const;
 
   // Returns true if a given bookmark is reachable (i.e. neither the bookmark,
   // nor any of its parents were "removed").
-  bool IsReachable(const BookmarkNode* node) const;
+  bool IsReachable(const bookmarks::BookmarkNode* node) const;
 
   // Returns true if a given node is editable and if editing is allowed.
-  bool IsEditable(const BookmarkNode* node) const;
+  bool IsEditable(const bookmarks::BookmarkNode* node) const;
 
   // Removes a given bookmark.
   // Makes the |node| (and, consequently, all its children) unreachable.
-  void RemoveBookmark(const BookmarkNode* node);
+  void RemoveBookmark(const bookmarks::BookmarkNode* node);
 
   // Renames a given bookmark.
-  void RenameBookmark(const BookmarkNode* node, const base::string16& title);
+  void RenameBookmark(const bookmarks::BookmarkNode* node,
+                      const base::string16& title);
 
   // For Loaded/Changed/ShimBeingDeleted notifications
   class Observer {
    public:
     // Called when the set of bookmarks, or their values/visibility changes
     virtual void PartnerShimChanged(PartnerBookmarksShim*) {}
     // Called when everything is loaded
     virtual void PartnerShimLoaded(PartnerBookmarksShim*) {}
     // Called just before everything got destroyed
     virtual void ShimBeingDeleted(PartnerBookmarksShim*) {}
    protected:
     virtual ~Observer() {}
   };
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // PartnerBookmarksShim versions of BookmarkModel/BookmarkNode methods
-  const BookmarkNode* GetNodeByID(int64 id) const;
-  base::string16 GetTitle(const BookmarkNode* node) const;
+  const bookmarks::BookmarkNode* GetNodeByID(int64 id) const;
+  base::string16 GetTitle(const bookmarks::BookmarkNode* node) const;
 
-  bool IsPartnerBookmark(const BookmarkNode* node) const;
-  const BookmarkNode* GetPartnerBookmarksRoot() const;
+  bool IsPartnerBookmark(const bookmarks::BookmarkNode* node) const;
+  const bookmarks::BookmarkNode* GetPartnerBookmarksRoot() const;
 
   // Sets the root node of the partner bookmarks and notifies any observers that
   // the shim has now been loaded.  Takes ownership of |root_node|.
-  void SetPartnerBookmarksRoot(BookmarkNode* root_node);
+  void SetPartnerBookmarksRoot(bookmarks::BookmarkNode* root_node);
 
   // Used as a "unique" identifier of the partner bookmark node for the purposes
   // of node deletion and title editing. Two bookmarks with the same URLs and
   // titles are considered indistinguishable.
   class NodeRenamingMapKey {
    public:
     NodeRenamingMapKey(const GURL& url, const base::string16& provider_title);
     ~NodeRenamingMapKey();
     const GURL& url() const { return url_; }
     const base::string16& provider_title() const { return provider_title_; }
@@ skipping 12 matching lines @@
   // For testing: clears partner bookmark model data.
   static void ClearPartnerModelForTesting();
 
   // For testing: re-enables partner bookmarks editing.
   static void EnablePartnerBookmarksEditing();
 
  private:
   explicit PartnerBookmarksShim(PrefService* prefs);
   ~PartnerBookmarksShim() override;
 
-  const BookmarkNode* GetNodeByID(const BookmarkNode* parent, int64 id) const;
+  const bookmarks::BookmarkNode* GetNodeByID(
+      const bookmarks::BookmarkNode* parent,
+      int64 id) const;
   void ReloadNodeMapping();
   void SaveNodeMapping();
 
-  scoped_ptr<BookmarkNode> partner_bookmarks_root_;
+  scoped_ptr<bookmarks::BookmarkNode> partner_bookmarks_root_;
   PrefService* prefs_;
   NodeRenamingMap node_rename_remove_map_;
 
   // The observers.
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksShim);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_SHIM_H_