Lands http://codereview.chromium.org/155128 for Thiago....

chrome/browser/bookmarks/bookmark_model.h

 // Copyright (c) 2006-2008 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_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 
 #include "build/build_config.h"
 
 #include <set>
@@ skipping 26 matching lines @@
 
 // BookmarkNode ---------------------------------------------------------------
 
 // BookmarkNode contains information about a starred entry: title, URL, favicon,
 // star id and type. BookmarkNodes are returned from a BookmarkModel.
 //
 class BookmarkNode : public TreeNode<BookmarkNode> {
   friend class BookmarkModel;
 
  public:
+  enum Type {
+    URL,
+    FOLDER,
+    BOOKMARK_BAR,
+    OTHER_NODE
+  };
   // Creates a new node with the specified url and id of 0
   explicit BookmarkNode(const GURL& url);
   // Creates a new node with the specified url and id.
   BookmarkNode(int id, const GURL& url);
   virtual ~BookmarkNode() {}
 
   // Returns the URL.
   const GURL& GetURL() const { return url_; }
 
   // Returns a unique id for this node.
   //
   // NOTE: this id is only unique for the session and NOT unique across
   // sessions. Don't persist it!
   int id() const { return id_; }
   // Sets the id to the given value.
   void set_id(int id) { id_ = id; }
 
   // Returns the type of this node.
-  history::StarredEntry::Type GetType() const { return type_; }
-  void SetType(history::StarredEntry::Type type) { type_ = type; }
+  BookmarkNode::Type GetType() const { return type_; }
+  void SetType(BookmarkNode::Type type) { type_ = type; }
 
   // Returns the time the bookmark/group was added.
   const base::Time& date_added() const { return date_added_; }
   // Sets the time the bookmark/group was added.
   void set_date_added(const base::Time& date) { date_added_ = date; }
 
   // Returns the last time the group was modified. This is only maintained
   // for folders (including the bookmark and other folder).
   const base::Time& date_group_modified() const { return date_group_modified_; }
   // Sets the last time the group was modified.
   void set_date_group_modified(const base::Time& date) {
     date_group_modified_ = date;
   }
 
   // Convenience for testing if this nodes represents a group. A group is
   // a node whose type is not URL.
-  bool is_folder() const { return type_ != history::StarredEntry::URL; }
+  bool is_folder() const { return type_ != URL; }
 
   // Is this a URL?
-  bool is_url() const { return type_ == history::StarredEntry::URL; }
+  bool is_url() const { return type_ == URL; }
 
   // Returns the favicon. In nearly all cases you should use the method
   // BookmarkModel::GetFavicon rather than this. BookmarkModel::GetFavicon
   // takes care of loading the favicon if it isn't already loaded, where as
   // this does not.
   const SkBitmap& favicon() const { return favicon_; }
   void set_favicon(const SkBitmap& icon) { favicon_ = icon; }
 
   // The following methods are used by the bookmark model, and are not
   // really useful outside of it.
@@ skipping 36 matching lines @@
 
   // If non-zero, it indicates we're loading the favicon and this is the handle
   // from the HistoryService.
   HistoryService::Handle favicon_load_handle_;
 
   // The URL. BookmarkModel maintains maps off this URL, it is important that
   // it not change once the node has been created.
   const GURL url_;
 
   // Type of node.
-  // TODO(sky): bug 1256202, convert this into a type defined here.
-  history::StarredEntry::Type type_;
+  BookmarkNode::Type type_;
 
   // Date we were created.
   base::Time date_added_;
 
   // Time last modified. Only used for groups.
   base::Time date_group_modified_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkNode);
 };
 
@@ skipping 346 matching lines @@
   scoped_refptr<BookmarkStorage> store_;
 
   scoped_ptr<BookmarkIndex> index_;
 
   base::WaitableEvent loaded_signal_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_