Final touches on the Linux BookmarkBubble.

  - Implement "close on escape" with a top level accelerator.
  - Fix an invalid read when opening the editor from the folder combo.
  - Clean up some signal handlers (returning bool from a void function, etc).

BUG=11738

Review URL: http://codereview.chromium.org/118493


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

1 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/gtk/info_bubble_gtk.h b/chrome/browser/gtk/info_bubble_gtk.h
index 0ea6c05..695537a 100644
--- a/chrome/browser/gtk/info_bubble_gtk.h
+++ b/chrome/browser/gtk/info_bubble_gtk.h
@@ -64,6 +64,15 @@ class InfoBubbleGtk {
   // the close is the result of pressing escape.
   void Close(bool closed_by_escape);
 
+  static gboolean HandleEscapeThunk(GtkAccelGroup* group,
+                                    GObject* acceleratable,
+                                    guint keyval,
+                                    GdkModifierType modifier,
+                                    gpointer user_data) {
+    return reinterpret_cast<InfoBubbleGtk*>(user_data)->HandleEscape();
+  }
+  gboolean HandleEscape();
+
   static gboolean HandleConfigureThunk(GtkWidget* widget,
                                        GdkEventConfigure* event,
                                        gpointer user_data) {
@@ -101,6 +110,9 @@ class InfoBubbleGtk {
   // it deletes us when it is destroyed.
   GtkWidget* window_;
 
+  // The accel group attached to |window_|, to handle closing with escape.
+  GtkAccelGroup* accel_group_;
+
   // Where we want our window to be positioned on the screen.
   int screen_x_;
   int screen_y_;