Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2740)

Unified Diff: chrome/browser/gtk/bookmark_manager_gtk.h

Issue 132048: Don't crash when reusing a bookmark context menu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/bookmark_context_menu.h ('k') | chrome/browser/gtk/bookmark_manager_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/bookmark_manager_gtk.h
===================================================================
--- chrome/browser/gtk/bookmark_manager_gtk.h (revision 18907)
+++ chrome/browser/gtk/bookmark_manager_gtk.h (working copy)
@@ -76,6 +76,9 @@
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().
@@ -176,6 +179,12 @@
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);
@@ -202,7 +211,12 @@
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_;
« no previous file with comments | « chrome/browser/bookmarks/bookmark_context_menu.h ('k') | chrome/browser/gtk/bookmark_manager_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698