diff options
| author | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 23:27:13 +0000 |
|---|---|---|
| committer | munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-13 23:27:13 +0000 |
| commit | 367d707fa4f9a6712ccb7035c530da5788a4f5a2 (patch) | |
| tree | 676c59f1f4eec2145a59fcb36c8894afab10042c /chrome/browser/gtk/bookmark_editor_gtk.cc | |
| parent | d8241d65b71b1409c9f6581b9ceee68f9bf35c3e (diff) | |
| download | chromium_src-367d707fa4f9a6712ccb7035c530da5788a4f5a2.zip chromium_src-367d707fa4f9a6712ccb7035c530da5788a4f5a2.tar.gz chromium_src-367d707fa4f9a6712ccb7035c530da5788a4f5a2.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/gtk/bookmark_editor_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/bookmark_editor_gtk.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc index 1a6171c..9824f44 100644 --- a/chrome/browser/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/gtk/bookmark_editor_gtk.cc @@ -152,7 +152,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { if (show_tree_) { GtkTreeIter selected_iter; - int selected_id = node_ ? node_->GetParent()->id() : 0; + int64 selected_id = node_ ? node_->GetParent()->id() : 0; tree_store_ = bookmark_utils::MakeFolderTreeStore(); bookmark_utils::AddToTreeStore(bb_model_, selected_id, tree_store_, &selected_iter); @@ -328,7 +328,7 @@ void BookmarkEditorGtk::AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child) { bookmark_utils::GetFolderIcon(), bookmark_utils::FOLDER_NAME, l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME).c_str(), - bookmark_utils::ITEM_ID, 0, + bookmark_utils::ITEM_ID, static_cast<int64>(0), -1); } |