From 367d707fa4f9a6712ccb7035c530da5788a4f5a2 Mon Sep 17 00:00:00 2001 From: "munjal@chromium.org" Date: Mon, 13 Jul 2009 23:27:13 +0000 Subject: Try the original CL "Always persist bookmark IDs" again with the fix to Valgrind issue. The fix is in bookmark_storage.h - initialized the newly added member ids_reassigned_ of LoadDetails class. See http://codereview.chromium.org/149310 for the original CL. TEST=NONE BUG=16068 Review URL: http://codereview.chromium.org/155456 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20565 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/bookmarks/bookmark_drag_data.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/bookmarks/bookmark_drag_data.cc') diff --git a/chrome/browser/bookmarks/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc index 732d119..bf3ae05 100644 --- a/chrome/browser/bookmarks/bookmark_drag_data.cc +++ b/chrome/browser/bookmarks/bookmark_drag_data.cc @@ -41,7 +41,7 @@ void BookmarkDragData::Element::WriteToPickle(Pickle* pickle) const { pickle->WriteBool(is_url); pickle->WriteString(url.spec()); pickle->WriteWString(title); - pickle->WriteInt(id_); + pickle->WriteInt64(id_); if (!is_url) { pickle->WriteSize(children.size()); for (std::vector::const_iterator i = children.begin(); @@ -57,7 +57,7 @@ bool BookmarkDragData::Element::ReadFromPickle(Pickle* pickle, if (!pickle->ReadBool(iterator, &is_url) || !pickle->ReadString(iterator, &url_spec) || !pickle->ReadWString(iterator, &title) || - !pickle->ReadInt(iterator, &id_)) { + !pickle->ReadInt64(iterator, &id_)) { return false; } url = GURL(url_spec); -- cgit v1.1