summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/gtk
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 21:22:37 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-06 21:22:37 +0000
commitdd6c9d1831d24a415c35eae2c24f8089520f3b6a (patch)
tree290eb0d951ccc904e578867c0887636017ae3dca /chrome/browser/ui/gtk
parent54661a5179e346ce82687db1788933a3912760bc (diff)
downloadchromium_src-dd6c9d1831d24a415c35eae2c24f8089520f3b6a.zip
chromium_src-dd6c9d1831d24a415c35eae2c24f8089520f3b6a.tar.gz
chromium_src-dd6c9d1831d24a415c35eae2c24f8089520f3b6a.tar.bz2
gtk: Add keyboard accelerator to kill a process/plug-in in Task Manager.
BUG=7229 TEST=1- Launch Chrome Task Manager and select any process/puglin in the window. 2- Hit Alt E(/e) to kill that process. R=evan@chromium.org Review URL: http://codereview.chromium.org/7582025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk')
-rw-r--r--chrome/browser/ui/gtk/task_manager_gtk.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
index ebcb3b8..cf908f8 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -366,8 +366,8 @@ void TaskManagerGtk::OnItemsChanged(int start, int length) {
SetRowDataFromModel(i, &iter);
if (i != start + length - 1) {
if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(process_list_), &iter)) {
- NOTREACHED() << "Can't get next GtkTreeIter object from process_list_ \
- iterator at position " << i;
+ NOTREACHED() << "Can't get next GtkTreeIter object from process_list_ "
+ "iterator at position " << i;
}
}
}
@@ -476,7 +476,8 @@ void TaskManagerGtk::Init() {
}
gtk_dialog_add_button(GTK_DIALOG(dialog_),
- l10n_util::GetStringUTF8(IDS_TASK_MANAGER_KILL).c_str(),
+ gfx::ConvertAcceleratorsFromWindowsStyle(
+ l10n_util::GetStringUTF8(IDS_TASK_MANAGER_KILL)).c_str(),
kTaskManagerResponseKill);
// The response button should not be sensitive when the dialog is first opened