Gtk: Allow all columns in task manager to be sortable.

chrome/browser/views/task_manager_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/stats_table.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 15 matching lines @@
 #include "views/controls/table/table_view_observer.h"
 #include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
 // The task manager window default size.
 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 {
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerTableModel class
 ////////////////////////////////////////////////////////////////////////////////
 
 class TaskManagerTableModel : public views::GroupTableModel,
                               public TaskManagerModelObserver {
  public:
   explicit TaskManagerTableModel(TaskManagerModel* model)
@@ skipping 55 matching lines @@
     case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:  // Memory
       if (!model_->IsResourceFirstInGroup(row))
         return std::wstring();
       return model_->GetResourcePhysicalMemory(row);
 
     case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
       if (!model_->IsResourceFirstInGroup(row))
         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:
       return model_->GetResourceStatsValue(row, col_id);
   }
 }
 
 SkBitmap TaskManagerTableModel::GetIcon(int row) {
   return model_->GetResourceIcon(row);
 }
@@ skipping 172 matching lines @@
   columns_.back().sortable = true;
 
   tab_table_ = new views::GroupTableView(table_model_.get(), columns_,
                                          views::ICON_AND_TEXT, false, true,
                                          true);
 
   // Hide some columns by default
   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(
       this, l10n_util::GetString(IDS_TASK_MANAGER_KILL));
   kill_button_->AddAccelerator(views::Accelerator('E', false, false, false));
   kill_button_->SetAccessibleKeyboardShortcut(L"E");
   about_memory_link_ = new views::Link(
       l10n_util::GetString(IDS_TASK_MANAGER_ABOUT_MEMORY_LINK));
   about_memory_link_->SetController(this);
 
@@ skipping 297 matching lines @@
 
 namespace browser {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager() {
   TaskManagerView::Show();
 }
 
 }  // namespace browser