summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/task_manager_gtk.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 01:16:14 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 01:16:14 +0000
commit96373d08aa941358daef07d6a5c6ddf161ddb51a (patch)
tree1590cd0b69f14faf6fc687eaa8911f9631b53ddf /chrome/browser/gtk/task_manager_gtk.cc
parentd345da8e3a16aa212e415eb58a259f45ca81ae77 (diff)
downloadchromium_src-96373d08aa941358daef07d6a5c6ddf161ddb51a.zip
chromium_src-96373d08aa941358daef07d6a5c6ddf161ddb51a.tar.gz
chromium_src-96373d08aa941358daef07d6a5c6ddf161ddb51a.tar.bz2
Task Manager sorting:
- remove dead code that papered over the fact certain columns don't sort, replace with NOTREACHED pothole - allow sorting by the javascript memory column. - allow sorting by goats teleported (useful for debugging) - stabilize \# of goats teleported (remove observer effect) BUG=42037 TEST=sort by these columns in the task manager Review URL: http://codereview.chromium.org/1706002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/task_manager_gtk.cc')
-rw-r--r--chrome/browser/gtk/task_manager_gtk.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc
index 20840f3..aa8577b 100644
--- a/chrome/browser/gtk/task_manager_gtk.cc
+++ b/chrome/browser/gtk/task_manager_gtk.cc
@@ -519,6 +519,9 @@ void TaskManagerGtk::CreateTaskManagerTreeview() {
kTaskManagerPrivateMem,
ComparePrivateMemory, this, NULL);
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
+ kTaskManagerJavaScriptMemory,
+ CompareV8Memory, this, NULL);
+ gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
kTaskManagerCPU,
CompareCPU, this, NULL);
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
@@ -624,7 +627,8 @@ std::string TaskManagerGtk::GetModelText(int row, int col_id) {
return WideToUTF8(model_->GetResourceGoatsTeleported(row));
default:
- return WideToUTF8(model_->GetResourceStatsValue(row, col_id));
+ NOTREACHED();
+ return std::string();
}
}