diff options
author | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 22:29:20 +0000 |
---|---|---|
committer | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-26 22:29:20 +0000 |
commit | b3c33d463366d2725ec4d669b98dc468a751c541 (patch) | |
tree | d8496a8ae8fc73ed71b93d67c055e9f1bba4fcc7 /chrome/browser/bookmarks/bookmark_drag_data.cc | |
parent | 7b91dfd0bce7b4f864d9654e8bd0a9f93683cec0 (diff) | |
download | chromium_src-b3c33d463366d2725ec4d669b98dc468a751c541.zip chromium_src-b3c33d463366d2725ec4d669b98dc468a751c541.tar.gz chromium_src-b3c33d463366d2725ec4d669b98dc468a751c541.tar.bz2 |
Make bookmark model public interface use const BookmarkNode* instead of
BookmarkNode*. This helps in making the BookmarkNode class setters public
also without worrying about someone inadvertently changing BookmarkNode
properties directly for bookmark model bookmarks.
Change all the call sites to reflect this.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/146116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_drag_data.cc')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_drag_data.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc index a6ae333..732d119 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data.cc @@ -28,7 +28,7 @@ static void RegisterFormat() { } #endif -BookmarkDragData::Element::Element(BookmarkNode* node) +BookmarkDragData::Element::Element(const BookmarkNode* node) : is_url(node->is_url()), url(node->GetURL()), title(node->GetTitle()), @@ -76,11 +76,12 @@ bool BookmarkDragData::Element::ReadFromPickle(Pickle* pickle, return true; } -BookmarkDragData::BookmarkDragData(BookmarkNode* node) { +BookmarkDragData::BookmarkDragData(const BookmarkNode* node) { elements.push_back(Element(node)); } -BookmarkDragData::BookmarkDragData(const std::vector<BookmarkNode*>& nodes) { +BookmarkDragData::BookmarkDragData( + const std::vector<const BookmarkNode*>& nodes) { for (size_t i = 0; i < nodes.size(); ++i) elements.push_back(Element(nodes[i])); } @@ -185,14 +186,15 @@ bool BookmarkDragData::ReadFromPickle(Pickle* pickle) { return true; } -std::vector<BookmarkNode*> BookmarkDragData::GetNodes(Profile* profile) const { - std::vector<BookmarkNode*> nodes; +std::vector<const BookmarkNode*> BookmarkDragData::GetNodes( + Profile* profile) const { + std::vector<const BookmarkNode*> nodes; if (!IsFromProfile(profile)) return nodes; for (size_t i = 0; i < elements.size(); ++i) { - BookmarkNode* node = + const BookmarkNode* node = profile->GetBookmarkModel()->GetNodeByID(elements[i].id_); if (!node) { nodes.clear(); @@ -203,8 +205,8 @@ std::vector<BookmarkNode*> BookmarkDragData::GetNodes(Profile* profile) const { return nodes; } -BookmarkNode* BookmarkDragData::GetFirstNode(Profile* profile) const { - std::vector<BookmarkNode*> nodes = GetNodes(profile); +const BookmarkNode* BookmarkDragData::GetFirstNode(Profile* profile) const { + std::vector<const BookmarkNode*> nodes = GetNodes(profile); return nodes.size() == 1 ? nodes[0] : NULL; } |