summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/gtk/task_manager_gtk.cc4
-rw-r--r--chrome/browser/views/task_manager_view.cc1
2 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc
index daa1b0b..f9095d0 100644
--- a/chrome/browser/gtk/task_manager_gtk.cc
+++ b/chrome/browser/gtk/task_manager_gtk.cc
@@ -802,10 +802,6 @@ gboolean TaskManagerGtk::OnButtonPressEvent(GtkWidget* widget,
gboolean TaskManagerGtk::OnButtonReleaseEvent(GtkWidget* widget,
GdkEventButton* event,
TaskManagerGtk* task_manager) {
- // We don't want to open the context menu in the treeview.
- if (gtk_util::WidgetContainsCursor(task_manager->treeview_))
- return FALSE;
-
if (event->button == 3)
task_manager->ShowContextMenu();
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index d605b77..2572cd0 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -343,6 +343,7 @@ void TaskManagerView::Init() {
UpdateStatsCounters();
tab_table_->SetObserver(this);
+ tab_table_->SetContextMenuController(this);
SetContextMenuController(this);
// If we're running with --purge-memory-button, add a "Purge memory" button.
if (CommandLine::ForCurrentProcess()->HasSwitch(