GTK: Fix bookmark manager crash on startup introduced by r20565

TBR=munjal


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20899 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 9 deletions

diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index 51a2a40..787b1f19 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -138,7 +138,7 @@ void BookmarkManagerGtk::SelectInTree(const BookmarkNode* node, bool expand) {
   // Expand the left tree view to |node| if |node| is a folder, or to the parent
   // folder of |node| if it is a URL.
   GtkTreeIter iter = { 0, };
-  int id = node->is_folder() ? node->id() : node->GetParent()->id();
+  int64 id = node->is_folder() ? node->id() : node->GetParent()->id();
   if (RecursiveFind(GTK_TREE_MODEL(left_store_), &iter, id)) {
     GtkTreePath* path = gtk_tree_model_get_path(GTK_TREE_MODEL(left_store_),
                         &iter);
@@ -436,7 +436,8 @@ GtkWidget* BookmarkManagerGtk::MakeLeftPane() {
 
 GtkWidget* BookmarkManagerGtk::MakeRightPane() {
   right_store_ = gtk_list_store_new(RIGHT_PANE_NUM,
-      GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+      GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+      G_TYPE_INT64);
 
   title_column_ = gtk_tree_view_column_new();
   gtk_tree_view_column_set_title(title_column_,
@@ -611,21 +612,21 @@ void BookmarkManagerGtk::BuildRightStore() {
     AddNodeToRightStore(i);
 }
 
-int BookmarkManagerGtk::GetRowIDAt(GtkTreeModel* model, GtkTreeIter* iter) {
+int64 BookmarkManagerGtk::GetRowIDAt(GtkTreeModel* model, GtkTreeIter* iter) {
   bool left = model == GTK_TREE_MODEL(left_store_);
   GValue value = { 0, };
   if (left)
     gtk_tree_model_get_value(model, iter, bookmark_utils::ITEM_ID, &value);
   else
     gtk_tree_model_get_value(model, iter, RIGHT_PANE_ID, &value);
-  int id = g_value_get_int(&value);
+  int64 id = g_value_get_int64(&value);
   g_value_unset(&value);
   return id;
 }
 
 const BookmarkNode* BookmarkManagerGtk::GetNodeAt(GtkTreeModel* model,
                                                   GtkTreeIter* iter) {
-  int id = GetRowIDAt(model, iter);
+  int64 id = GetRowIDAt(model, iter);
   if (id > 0)
     return model_->GetNodeByID(id);
   else
@@ -750,7 +751,7 @@ void BookmarkManagerGtk::SendDelayedMousedown() {
 }
 
 bool BookmarkManagerGtk::RecursiveFind(GtkTreeModel* model, GtkTreeIter* iter,
-                                       int target) {
+                                       int64 target) {
   GValue value = { 0, };
   bool left = model == GTK_TREE_MODEL(left_store_);
   if (left) {
@@ -764,7 +765,7 @@ bool BookmarkManagerGtk::RecursiveFind(GtkTreeModel* model, GtkTreeIter* iter,
     gtk_tree_model_get_value(model, iter, RIGHT_PANE_ID, &value);
   }
 
-  int id = g_value_get_int(&value);
+  int64 id = g_value_get_int(&value);
   g_value_unset(&value);
 
   if (id == target) {
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.h b/chrome/browser/gtk/bookmark_manager_gtk.h
index 402e454..6bf1dd8 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.h
+++ b/chrome/browser/gtk/bookmark_manager_gtk.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "app/table_model_observer.h"
+#include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -86,7 +87,7 @@ class BookmarkManagerGtk : public BookmarkModelObserver,
   void BuildRightStore();
 
   // Get the ID of the item at |iter|.
-  int GetRowIDAt(GtkTreeModel* model, GtkTreeIter* iter);
+  int64 GetRowIDAt(GtkTreeModel* model, GtkTreeIter* iter);
 
   // Get the node from |model| at |iter|. If the item is not a node, return
   // NULL.
@@ -140,7 +141,7 @@ class BookmarkManagerGtk : public BookmarkModelObserver,
   // Tries to find the node with id |target_id|. If found, returns true and set
   // |iter| to point to the entry. If you pass a |iter| with stamp of 0, then it
   // will be treated as the first row of |model|.
-  bool RecursiveFind(GtkTreeModel* model, GtkTreeIter* iter, int target_id);
+  bool RecursiveFind(GtkTreeModel* model, GtkTreeIter* iter, int64 target_id);
 
   // Search helpers.
   void PerformSearch();