summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 17:28:04 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 17:28:04 +0000
commitbc77765e44ca594f4b2501db7a7c7411220552a9 (patch)
tree3e9791b792567622227245d41200a80d46e46cfc /chrome
parente0cd12237c3ce5edf64b66d1d3692255364a5bf1 (diff)
downloadchromium_src-bc77765e44ca594f4b2501db7a7c7411220552a9.zip
chromium_src-bc77765e44ca594f4b2501db7a7c7411220552a9.tar.gz
chromium_src-bc77765e44ca594f4b2501db7a7c7411220552a9.tar.bz2
Task Manager: show right click context menu no matter where you click on the task manager window.
discoverability++ Review URL: http://codereview.chromium.org/203047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28005 0039d316-1c4b-4281-b951-d872f2087c98
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(