diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 20:14:13 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 20:14:13 +0000 |
| commit | 0245eb5a649d28a927c1248b06ebb7874a9bd494 (patch) | |
| tree | 1c9507fc31c59b68729bebe16ef63403b55be332 /chrome | |
| parent | 70635d255ff0073ec9698f7aea7f067d2aa262e5 (diff) | |
| download | chromium_src-0245eb5a649d28a927c1248b06ebb7874a9bd494.zip chromium_src-0245eb5a649d28a927c1248b06ebb7874a9bd494.tar.gz chromium_src-0245eb5a649d28a927c1248b06ebb7874a9bd494.tar.bz2 | |
GTK: Fix crash because of wrong prototype.
BUG=37950
TEST=none
Review URL: http://codereview.chromium.org/837006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/bookmark_bubble_gtk.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/gtk/bookmark_bubble_gtk.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc index 7b16fb8..b90003e 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc @@ -296,7 +296,8 @@ void BookmarkBubbleGtk::OnFolderChanged(GtkWidget* widget) { } } -void BookmarkBubbleGtk::OnFolderPopupShown(GtkWidget* widget) { +void BookmarkBubbleGtk::OnFolderPopupShown(GtkWidget* widget, + GParamSpec* property) { // GtkComboBox grabs the keyboard and pointer when it displays its popup, // which steals the grabs that InfoBubbleGtk had installed. When the popup is // hidden, we notify InfoBubbleGtk so it can try to reacquire the grabs diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.h b/chrome/browser/gtk/bookmark_bubble_gtk.h index ff8688b..8e9424f 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.h +++ b/chrome/browser/gtk/bookmark_bubble_gtk.h @@ -64,7 +64,8 @@ class BookmarkBubbleGtk : public InfoBubbleGtkDelegate, CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnDestroy); CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnNameActivate); CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnFolderChanged); - CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnFolderPopupShown); + CHROMEGTK_CALLBACK_1(BookmarkBubbleGtk, void, OnFolderPopupShown, + GParamSpec*); CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnEditClicked); CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnCloseClicked); CHROMEGTK_CALLBACK_0(BookmarkBubbleGtk, void, OnRemoveClicked); |