Add ctrl+w accelerator to close bookmark manager for linux

chrome/browser/gtk/bookmark_manager_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/gtk/bookmark_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 303 matching lines @@
 BookmarkManagerGtk::BookmarkManagerGtk(Profile* profile)
     : profile_(profile),
       model_(profile->GetBookmarkModel()),
       organize_is_for_left_(true),
       search_factory_(this),
       select_file_dialog_(SelectFileDialog::Create(this)),
       delaying_mousedown_(false),
       sending_delayed_mousedown_(false),
       ignore_rightclicks_(false) {
   InitWidgets();
+  ConnectAccelerators();
   gtk_util::SetWindowIcon(GTK_WINDOW(window_));
 
   model_->AddObserver(this);
   if (model_->IsLoaded())
     Loaded(model_);
 
   gtk_widget_show_all(window_);
 }
 
 BookmarkManagerGtk::~BookmarkManagerGtk() {
@@ skipping 90 matching lines @@
   gtk_paned_set_position(GTK_PANED(paned_), split_x);
 
   GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(vbox), paned_, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(window_), vbox);
 
   ResetOrganizeMenu(true);
 }
 
+void BookmarkManagerGtk::ConnectAccelerators() {
+  GtkAccelGroup* accel_group = gtk_accel_group_new();
+  gtk_window_add_accel_group(GTK_WINDOW(window_), accel_group);
+
+  // Drop the initial ref on |accel_group| so |window_| will own it.
+  g_object_unref(accel_group);
+
+  gtk_accel_group_connect(accel_group,
+                          GDK_w, GDK_CONTROL_MASK, GtkAccelFlags(0),
+                          g_cclosure_new(G_CALLBACK(OnGtkAccelerator),
+                                         this, NULL));
+}
+
 GtkWidget* BookmarkManagerGtk::MakeLeftPane() {
   left_store_ = bookmark_utils::MakeFolderTreeStore();
   left_tree_view_ = bookmark_utils::MakeTreeViewForStore(left_store_);
 
   // When a row is collapsed that contained the selected node, we want to select
   // it.
   g_signal_connect(left_tree_view_, "row-collapsed",
                    G_CALLBACK(OnLeftTreeViewRowCollapsed), this);
   g_signal_connect(left_tree_view_, "focus-in-event",
                    G_CALLBACK(OnLeftTreeViewFocusIn), this);
@@ skipping 981 matching lines @@
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
           g_browser_process->io_thread()->message_loop(), model_,
           path.ToWStringHack());
     }
   } else {
     NOTREACHED();
   }
 }
+
+// static
+gboolean BookmarkManagerGtk::OnGtkAccelerator(GtkAccelGroup* accel_group,
+    GObject* acceleratable,
+    guint keyval,
+    GdkModifierType modifier,
+    BookmarkManagerGtk* bookmark_manager) {
+  modifier = static_cast<GdkModifierType>(
+      modifier & gtk_accelerator_get_default_mod_mask());
+  // The only accelerator we have registered is ctrl+w, so any other value is a
+  // non-fatal error.
+  DCHECK_EQ(keyval, static_cast<guint>(GDK_w));
+  DCHECK_EQ(modifier, GDK_CONTROL_MASK);
+
+  gtk_widget_destroy(bookmark_manager->window_);
+
+  return TRUE;
+}