Don't crash when reusing a bookmark context menu.

chrome/browser/gtk/bookmark_manager_gtk.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.TIT
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GTK_BOOKMARK_MANAGER_GTK_H_
 #define CHROME_BROWSER_GTK_BOOKMARK_MANAGER_GTK_H_
 
 #include <gtk/gtk.h>
 #include <vector>
 
@@ skipping 58 matching lines @@
   // SelectFileDialog::Listener implemenation.
   virtual void FileSelected(const FilePath& path,
                             int index, void* params);
 
  private:
   explicit BookmarkManagerGtk(Profile* profile);
 
   void InitWidgets();
   GtkWidget* MakeLeftPane();
   GtkWidget* MakeRightPane();
+  // If |left|, then make the organize menu refer to that which is selected in
+  // the left pane, otherwise use the right pane selection.
+  void ResetOrganizeMenu(bool left);
 
   // Pack the data from the bookmark model into the stores. This does not
   // create the stores, which is done in Make{Left,Right}Pane().
   // This one should only be called once (when the bookmark model is loaded).
   void BuildLeftStore();
   // This one clears the old right pane and refills it with the contents of
   // whatever folder is selected on the left. It can be called multiple times.
   void BuildRightStore();
 
   // Get the ID of the item at |iter|.
@@ skipping 80 matching lines @@
       GdkDragContext* drag_context, BookmarkManagerGtk* bookmark_manager);
 
   static gboolean OnRightTreeViewDragMotion(GtkWidget* tree_view,
       GdkDragContext* context, gint x, gint y, guint time,
       BookmarkManagerGtk* bookmark_manager);
 
   static void OnRightTreeViewRowActivated(GtkTreeView* tree_view,
       GtkTreePath* path, GtkTreeViewColumn* column,
       BookmarkManagerGtk* bookmark_manager);
 
+  static void OnRightTreeViewFocusIn(GtkTreeView* tree_view,
+      GdkEventFocus* event, BookmarkManagerGtk* bookmark_manager);
+
+  static void OnLeftTreeViewFocusIn(GtkTreeView* tree_view,
+      GdkEventFocus* event, BookmarkManagerGtk* bookmark_manager);
+
   // Tools menu item callbacks.
   static void OnImportItemActivated(GtkMenuItem* menuitem,
                                     BookmarkManagerGtk* bookmark_manager);
   static void OnExportItemActivated(GtkMenuItem* menuitem,
                                     BookmarkManagerGtk* bookmark_manager);
 
   GtkWidget* window_;
   GtkWidget* search_entry_;
   Profile* profile_;
   BookmarkModel* model_;
   GtkWidget* left_tree_view_;
   GtkWidget* right_tree_view_;
 
   enum {
     RIGHT_PANE_PIXBUF,
     RIGHT_PANE_TITLE,
     RIGHT_PANE_URL,
     RIGHT_PANE_PATH,
     RIGHT_PANE_ID,
     RIGHT_PANE_NUM
   };
   GtkTreeStore* left_store_;
   GtkListStore* right_store_;
   GtkTreeViewColumn* path_column_;
   scoped_ptr<BookmarkTableModel> right_tree_model_;
 
+  // The Organize menu item.
+  GtkWidget* organize_;
+  // The submenu the item pops up.
   scoped_ptr<BookmarkContextMenu> organize_menu_;
+  // Whether the menu refers to the left selection.
+  bool organize_is_for_left_;
 
   // Factory used for delaying search.
   ScopedRunnableMethodFactory<BookmarkManagerGtk> search_factory_;
 
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_MANAGER_GTK_H_