Experimental bookmark model based on tags.

chrome/browser/bookmarks/bookmark_tag_model.h

+// Copyright (c) 2013 The Chromium Authors. All rights reserved.

[lpromero-g, 2013/10/14 09:18:17]

nit: No (c). Here and in every new file (also check the year).

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_TAG_MODEL_H_

[sky, 2013/10/11 21:57:41]

nit: newline between 3/4.

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_TAG_MODEL_H_
+
+#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_observer.h"
+
+class BookmarkTagModelObserver;
+
+typedef string16 BookmarkTag;
+
+// BookmarTagModel provides a way to access and manipulate bookmarks in a non

[sky, 2013/10/11 21:57:41]

nit: non-hierarchical

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+// hierarchical way. It converts on demand the data from an existing
+// BookmarkModel to its warped view of the world. It also uses the BookmarkModel

[sky, 2013/10/11 21:57:41]

HAH! Please document better what 'warped view of the world' means.

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+// for storage.
+//
+// BookmarkTagModel view the bookmarks as a flat list, and each one can be
+// marked with a collection of tags.
+//
+// An observer may be attached to a BookmarkTagModel to observe relevant events.
+//
+class BookmarkTagModel : public BookmarkModelObserver {
+ public:
+
+  // Used to sort bookmarks.
+  enum BookmarkOrdering {

[sky, 2013/10/11 21:57:41]

Name enums as document in component: "enum values should start with the name of
the type, i.e. PAGE_TRANSITION_LINK in the content::PageTransition enum"

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+    UNSORTED_BOOKMARK_ORDERING,      // No sort applied.
+    TITLE_BOOKMARK_ORDERING,         // Sort by title.
+    URL_BOOKMARK_ORDERING,           // Sort by URL.
+    CREATION_TIME_BOOKMARK_ORDERING, // Sort by creation time.
+  };

[sky, 2013/10/11 21:57:41]

Is there a reason you baked sorting into these functions too? Seems like it
would be nice to return a set<BookmarkNode*> and have sorting done externally.

[noyau (Ping after 24h), 2013/10/14 23:59:39]

I've removed the ordering for everything, including all those enums. The only
place I kept an ordering is in tagsRelatedToTags where the tags are now always
sorted by relevance.

+
+  // Used to sort tags.
+  enum TagOrdering {
+    UNSORTED_TAG_ORDERING,      // No sort applied.
+    MOST_USED_TAG_ORDERING,     // Order by count of tagged bookmarks.
+    ALPHABETICAL_TAG_ORDERING,  // Alphabetical order.
+  };
+
+  explicit BookmarkTagModel(BookmarkModel* bookmark_model);
+  virtual ~BookmarkTagModel();
+
+  // Returns true if the model finished loading.
+  bool loaded() const { return loaded_; }
+
+  // Add and remove observers on this object.
+  void AddObserver(BookmarkTagModelObserver* observer);
+  void RemoveObserver(BookmarkTagModelObserver* observer);
+
+  // Notifies the observers that an extensive set of changes is about to happen,
+  // such as during import or sync, so they can delay any expensive UI updates
+  // until it's finished.
+  void BeginExtensiveChanges();

[sky, 2013/10/11 21:57:41]

Can you hide these behind a scoper object that is a friend?

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+  void EndExtensiveChanges();
+
+  // Returns true if this bookmark model is currently in a mode where extensive
+  // changes might happen, such as for import and sync. This is helpful for
+  // observers that are created after the mode has started, and want to check
+  // state during their own initializer.
+  bool IsDoingExtensiveChanges() const;
+
+  // Removes the given |BookmarkNode|. Observers are notified immediately.
+  void Remove(const BookmarkNode* bookmark);
+
+  // Removes all the bookmark nodes. Observers are only notified when all nodes
+  // have been removed. There is no notification for individual node removals.
+  void RemoveAll();
+
+  // Returns the favicon for |node|. If the favicon has not yet been
+  // loaded it is loaded and the observer of the model notified when done.
+  const gfx::Image& GetFavicon(const BookmarkNode* bookmark);
+
+  // Sets the title of |node|.
+  void SetTitle(const BookmarkNode* bookmark, const string16& title);
+
+  // Sets the URL of |node|.
+  void SetURL(const BookmarkNode* bookmark, const GURL& url);
+
+  // Sets the date added time of |node|.
+  void SetDateAdded(const BookmarkNode* bookmark, base::Time date_added);
+
+  // Returns the most recently added bookmark for the |url|. Returns NULL if
+  // |url| is not bookmarked.
+  const BookmarkNode* GetMostRecentlyAddedBookmarkForURL(const GURL& url);
+
+  // Creates a new bookmark.
+  const BookmarkNode* AddURL(const string16& title,
+                             const GURL& url,
+                             const std::set<BookmarkTag>& tags);
+
+  // Adds the |tags| to the tag list of the |bookmark|.
+  void AddTagsToBookmark(const std::set<BookmarkTag>& tags,
+                         const BookmarkNode* bookmark);
+
+  // Same but to a whole collection of |bookmarks|.
+  void AddTagsToBookmarks(const std::set<BookmarkTag>& tags,
+                          const std::set<const BookmarkNode*>& bookmarks);
+
+  // Remove the |tags| from the tag list of the |bookmark|. If the bookmark
+  // is not tagged with one or more of the tags, these are ignored.
+  void RemoveTagsFromBookmark(const std::set<BookmarkTag>& tags,
+                              const BookmarkNode* bookmark);
+
+  // Same but to a whole collection of |bookmarks|.
+  void RemoveTagsFromBookmarks(const std::set<BookmarkTag>& tags,
+                               const std::set<const BookmarkNode*>& bookmarks);
+
+  // Returns all the tags set on a specific |bookmark|.
+  std::set<BookmarkTag> AllTagsForBookmark(const BookmarkNode* bookmark);

[sky, 2013/10/11 21:57:41]

GetTagsForBookmark?

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+
+  // Returns the bookmarks marked with all the given |tags| sorted with the
+  // specified |ordering|.
+  std::vector<const BookmarkNode*> BookmarksForTags(
+      const std::set<BookmarkTag>& tags, BookmarkOrdering ordering);

[sky, 2013/10/11 21:57:41]

nit: when you wrap, one line per param.

+
+  // Returns the bookmarks marked with the given |tag| sorted with the specified
+  // |ordering|.
+  std::vector<const BookmarkNode*> BookmarksForTag(const BookmarkTag& tag,
+                                                   BookmarkOrdering ordering);
+
+  // Returns all tags related to the parent |tag|. If |tag| is null this method
+  // will returns and sort all tags in the system. A related tag is a tag used
+  // on one or more of the bookmarks tagged with |tag|.
+  std::vector<BookmarkTag> TagsRelatedToTag(const BookmarkTag& tag,
+                                            TagOrdering ordering);
+
+  // All the BookmarkModelObserver methods. See there for details.
+  virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) 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 OnWillRemoveBookmarks(BookmarkModel* model,
+                                     const BookmarkNode* parent,
+                                     int old_index,
+                                     const BookmarkNode* node) OVERRIDE;
+  virtual void BookmarkNodeRemoved(BookmarkModel* model,
+                                   const BookmarkNode* parent,
+                                   int old_index,
+                                   const BookmarkNode* node) OVERRIDE;
+  virtual void OnWillChangeBookmarkNode(BookmarkModel* model,
+                                        const BookmarkNode* node) OVERRIDE;
+  virtual void BookmarkNodeChanged(BookmarkModel* model,
+                                   const BookmarkNode* node) OVERRIDE;
+  virtual void OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
+                                            const BookmarkNode* node) OVERRIDE;
+  virtual void BookmarkMetaInfoChanged(BookmarkModel* model,
+                                       const BookmarkNode* node) OVERRIDE;
+  virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
+                                          const BookmarkNode* node) OVERRIDE;
+  virtual void OnWillReorderBookmarkNode(BookmarkModel* model,
+                                         const BookmarkNode* node) OVERRIDE;
+  virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
+                                             const BookmarkNode* node) OVERRIDE;
+  virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE;
+  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE;
+  virtual void OnWillRemoveAllBookmarks(BookmarkModel* model) OVERRIDE;
+  virtual void BookmarkAllNodesRemoved(BookmarkModel* model) OVERRIDE;
+
+ private:
+  // The tags are currently stored in the BookmarkNode's metaInfo in JSON
+  // format. This method extracts the info from there and returns it in
+  // digestible format.
+  // If the Bookmark was never tagged before it is implicitely tagged with the
+  // title of all its ancestors in the BookmarkModel.
+  std::set<BookmarkTag> ExtractTagsFromBookmark(const BookmarkNode *bookmark);
+
+  // Encode the tags in a format suitable for the BookmarkNode's metaInfo and
+  // set or replace the value.
+  void ReplaceTagsOnBookmark(const std::set<BookmarkTag>& tags,

[sky, 2013/10/11 21:57:41]

nit: SetTagsOnBookmark ?

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+                             const BookmarkNode* bookmark);
+
+  // Build the caches of tag to bookmarks and bookmarks to tag for faster
+  // access to the data. Load() is called from the constructor if possible, or
+  // as soon as possible after that.
+  void Load();
+
+  // Clear the local cache of all mentions of |bookmark|.
+  void RemoveBookmark(const BookmarkNode* bookmark);
+
+  // Extract the tags from |bookmark| and insert it in the local cache.
+  void LoadBookmark(const BookmarkNode* bookmark);
+
+  // The model from where the data is permanently stored.
+  BookmarkModel *bookmark_model_;
+
+  // True if the model is fully loaded.
+  bool loaded_;
+
+  // The observers.
+  ObserverList<BookmarkTagModelObserver> observers_;
+
+  // Local cache for quick access.
+  std::map<const BookmarkTag, std::set<const BookmarkNode*> > tag_to_bookmarks_;
+  std::map<const BookmarkNode*, std::set<BookmarkTag> > bookmark_to_tags_;
+
+  // Set to true during the creation of a new bookmark in order to send only the
+  // proper notification.
+  bool inhibit_change_notifications_;
+};

[sky, 2013/10/11 21:57:41]

DISALLOW...

[noyau (Ping after 24h), 2013/10/14 23:59:39]

Done.

+
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_TAG_MODEL_H_