diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/gtk/bookmark_menu_controller_gtk.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/gtk/bookmark_menu_controller_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/bookmark_menu_controller_gtk.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.h b/chrome/browser/gtk/bookmark_menu_controller_gtk.h index 21f2bb9..cf8443c 100644 --- a/chrome/browser/gtk/bookmark_menu_controller_gtk.h +++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.h @@ -68,12 +68,11 @@ class BookmarkMenuController : public BaseBookmarkModelObserver, void NavigateToMenuItem(GtkWidget* menu_item, WindowOpenDisposition disposition); - // Button press and release events for a GtkMenu and GtkMenuItem, - // respectively. We have to override these separate from OnMenuItemActivated - // because we need to handle right clicks and opening bookmarks with - // different dispositions. - CHROMEGTK_CALLBACK_1(BookmarkMenuController, gboolean, OnButtonPressed, - GdkEventButton*); + // Button press and release events for a GtkMenu. + CHROMEGTK_CALLBACK_1(BookmarkMenuController, gboolean, + OnMenuButtonPressedOrReleased, GdkEventButton*); + + // Button release event for a GtkMenuItem. CHROMEGTK_CALLBACK_1(BookmarkMenuController, gboolean, OnButtonReleased, GdkEventButton*); |