Connect the ctrl-w accelerator to the task manager dialog, and close the wind...

chrome/browser/gtk/task_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/task_manager_gtk.h"
 
+#include <gdk/gdkkeysyms.h>
+
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
@@ skipping 288 matching lines @@
 void TaskManagerGtk::Init() {
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_TASK_MANAGER_TITLE).c_str(),
       // Task Manager window is shared between all browsers.
       NULL,
       GTK_DIALOG_NO_SEPARATOR,
       l10n_util::GetStringUTF8(IDS_TASK_MANAGER_KILL).c_str(),
       kTaskManagerResponseKill,
       NULL);
 
+  ConnectAccelerators();
+
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
                       gtk_util::kContentAreaSpacing);
 
   g_signal_connect(G_OBJECT(dialog_), "response", G_CALLBACK(OnResponse), this);
   g_signal_connect(G_OBJECT(dialog_), "button-release-event",
                    G_CALLBACK(OnButtonReleaseEvent), this);
   gtk_widget_add_events(dialog_,
                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 
   // Wrap the treeview widget in a scrolled window in order to have a frame.
@@ skipping 30 matching lines @@
                    G_CALLBACK(OnSelectionChanged), this);
 
   gtk_container_add(GTK_CONTAINER(scrolled), treeview_);
 
   gtk_window_resize(GTK_WINDOW(dialog_), kDefaultWidth, kDefaultHeight);
   gtk_widget_show_all(dialog_);
 
   model_->SetObserver(this);
 }
 
+void TaskManagerGtk::ConnectAccelerators() {
+  GtkAccelGroup* accel_group = gtk_accel_group_new();
+  gtk_window_add_accel_group(GTK_WINDOW(dialog_), accel_group);
+
+  // Drop the initial ref on |accel_group| so |dialog_| 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));
+}
+
 void TaskManagerGtk::CreateTaskManagerTreeview() {
   treeview_ = gtk_tree_view_new();
 
   TreeViewInsertColumnWithPixbuf(treeview_, IDS_TASK_MANAGER_PAGE_COLUMN);
   TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN);
   TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
   TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
   TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_CPU_COLUMN);
   TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_NET_COLUMN);
   TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_PROCESS_ID_COLUMN);
@@ skipping 162 matching lines @@
                                               TaskManagerGtk* task_manager) {
   // We don't want to open the context menu in the treeview.
   if (widget == task_manager->treeview_)
     return TRUE;
 
   if (event->button == 3)
     task_manager->ShowContextMenu();
 
   return FALSE;
 }
+
+// static
+gboolean TaskManagerGtk::OnGtkAccelerator(GtkAccelGroup* accel_group,
+                                          GObject* acceleratable,
+                                          guint keyval,
+                                          GdkModifierType modifier,
+                                          TaskManagerGtk* task_manager) {
+  if (keyval == GDK_w && modifier == GDK_CONTROL_MASK) {
+    // The GTK_RESPONSE_DELETE_EVENT response must be sent before the widget
+    // is destroyed.  The deleted object will receive gtk signals otherwise.
+    gtk_dialog_response(GTK_DIALOG(task_manager->dialog_),
+                        GTK_RESPONSE_DELETE_EVENT);
+    gtk_widget_destroy(task_manager->dialog_);
+  }
+
+  return TRUE;
+}