diff options
author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-11 15:22:32 +0000 |
---|---|---|
committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-11 15:22:32 +0000 |
commit | d8e41ed4a55e60be60d47de5bbcb8a027e85a879 (patch) | |
tree | e0feaa030fe3834c0fc871de7564ef74e9595b05 /chrome/browser/bookmarks/bookmark_drag_data.cc | |
parent | 7903e0262e2dda44eaa186d126cf88e2cc1470eb (diff) | |
download | chromium_src-d8e41ed4a55e60be60d47de5bbcb8a027e85a879.zip chromium_src-d8e41ed4a55e60be60d47de5bbcb8a027e85a879.tar.gz chromium_src-d8e41ed4a55e60be60d47de5bbcb8a027e85a879.tar.bz2 |
Renames BoomarkBarModel to BookmarkModel.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1912
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2057 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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc index 61c9ccc..996470c 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data.cc @@ -5,7 +5,7 @@ #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "base/pickle.h" -#include "chrome/browser/bookmarks/bookmark_bar_model.h" +#include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/common/os_exchange_data.h" static CLIPFORMAT clipboard_format = 0; @@ -20,7 +20,7 @@ static void RegisterFormat() { BookmarkDragData::BookmarkDragData() : is_url(false), is_valid(false) { } -BookmarkDragData::BookmarkDragData(BookmarkBarNode* node) +BookmarkDragData::BookmarkDragData(BookmarkNode* node) : is_url(node->GetType() == history::StarredEntry::URL), url(node->GetURL()), title(node->GetTitle()), @@ -62,7 +62,7 @@ bool BookmarkDragData::Read(const OSExchangeData& data) { return is_valid; } -BookmarkBarNode* BookmarkDragData::GetNode(BookmarkBarModel* model) const { +BookmarkNode* BookmarkDragData::GetNode(BookmarkModel* model) const { DCHECK(!is_url && id_ && is_valid); return model->GetNodeByID(id_); } @@ -111,7 +111,7 @@ bool BookmarkDragData::ReadFromPickle(Pickle* pickle, void** iterator) { return true; } -void BookmarkDragData::AddChildren(BookmarkBarNode* node) { +void BookmarkDragData::AddChildren(BookmarkNode* node) { for (int i = 0, max = node->GetChildCount(); i < max; ++i) children.push_back(BookmarkDragData(node->GetChild(i))); } |