summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authormhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 02:42:42 +0000
committermhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 02:42:42 +0000
commit8f0bcb9f2381746bfc8f234fe1fcf831321adbf5 (patch)
tree72445ad8515bd7613858acc406e722e9b07f811d /chrome/browser/views
parentee9be6939302cb196a05c39ba17e150a678651e9 (diff)
downloadchromium_src-8f0bcb9f2381746bfc8f234fe1fcf831321adbf5.zip
chromium_src-8f0bcb9f2381746bfc8f234fe1fcf831321adbf5.tar.gz
chromium_src-8f0bcb9f2381746bfc8f234fe1fcf831321adbf5.tar.bz2
Gtk: Allow all columns in task manager to be sortable.
BUG=21048 TEST=Open task manager and sort any column Review URL: http://codereview.chromium.org/196040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/task_manager_view.cc16
1 files changed, 3 insertions, 13 deletions
diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc
index d449a92..b305a96 100644
--- a/chrome/browser/views/task_manager_view.cc
+++ b/chrome/browser/views/task_manager_view.cc
@@ -33,13 +33,6 @@
static const int kDefaultWidth = 460;
static const int kDefaultHeight = 270;
-// An id for the most important column, made sufficiently large so as not to
-// collide with anything else.
-static const int64 kNuthMagicNumber = 1737350766;
-static const int kBitMask = 0x7FFFFFFF;
-static const int kGoatsTeleportedColumn =
- (94024 * kNuthMagicNumber) & kBitMask;
-
namespace {
////////////////////////////////////////////////////////////////////////////////
@@ -115,7 +108,7 @@ std::wstring TaskManagerTableModel::GetText(int row, int col_id) {
return std::wstring();
return model_->GetResourceProcessId(row);
- case kGoatsTeleportedColumn: // Goats Teleported!
+ case IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN: // Goats Teleported!
return model_->GetResourceGoatsTeleported(row);
default:
@@ -308,13 +301,10 @@ void TaskManagerView::Init() {
tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PROCESS_ID_COLUMN, false);
tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_SHARED_MEM_COLUMN, false);
tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN, false);
+ tab_table_->SetColumnVisibility(IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN,
+ false);
UpdateStatsCounters();
- TableColumn col(kGoatsTeleportedColumn, L"Goats Teleported",
- TableColumn::RIGHT, -1, 0);
- col.sortable = true;
- columns_.push_back(col);
- tab_table_->AddColumn(col);
tab_table_->SetObserver(this);
SetContextMenuController(this);
kill_button_ = new views::NativeButton(