summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks/bookmark_codec.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 18:01:28 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 18:01:28 +0000
commitea2e5aa57f173880eabea2054729b5e1bc6b3560 (patch)
tree131b44e7c74f50e1bd819680027d3fb589b156f0 /chrome/browser/bookmarks/bookmark_codec.cc
parentd47dbff4e1e960450c9a1b0666035de2fce88ee9 (diff)
downloadchromium_src-ea2e5aa57f173880eabea2054729b5e1bc6b3560.zip
chromium_src-ea2e5aa57f173880eabea2054729b5e1bc6b3560.tar.gz
chromium_src-ea2e5aa57f173880eabea2054729b5e1bc6b3560.tar.bz2
Moves GetFavIcon from BookmarkNode to BookmarkModel. I'm doing this
for two reasons: . it cuts down on each node needing a reference to the model. . it makes it clear nodes shouldn't need to talk with the model. I'm primarily doing this for the last point as I'm going to populate nodes on a background thread shortly and I don't want to risk the chance of someone trying to talk with the model. BUG=none TEST=none Review URL: http://codereview.chromium.org/113617 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks/bookmark_codec.cc')
-rw-r--r--chrome/browser/bookmarks/bookmark_codec.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 6e80666..6025994 100644
--- a/chrome/browser/bookmarks/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -263,7 +263,7 @@ bool BookmarkCodec::DecodeNode(BookmarkModel* model,
return false;
// TODO(sky): this should ignore the node if not a valid URL.
if (!node)
- node = new BookmarkNode(model, id, GURL(WideToUTF8(url_string)));
+ node = new BookmarkNode(id, GURL(WideToUTF8(url_string)));
else
NOTREACHED(); // In case of a URL type node should always be NULL.
@@ -285,7 +285,7 @@ bool BookmarkCodec::DecodeNode(BookmarkModel* model,
return false;
if (!node) {
- node = new BookmarkNode(model, id, GURL());
+ node = new BookmarkNode(id, GURL());
} else if (persist_ids_) {
// If a new node is not created, explicitly assign persisted ID to the
// existing node.