| Index: chrome/browser/ui/gtk/task_manager_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc
|
| index e7b450f8063fa01be3b3bd4ab76427f4317b7d2a..6700a3bdebbe7b5309f6554494a2a2721d98f735 100644
|
| --- a/chrome/browser/ui/gtk/task_manager_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
|
| @@ -55,7 +55,7 @@ const gint kTaskManagerPurgeMemory = 3;
|
|
|
| enum TaskManagerColumn {
|
| kTaskManagerIcon,
|
| - kTaskManagerPage,
|
| + kTaskManagerTask,
|
| kTaskManagerProfileName,
|
| kTaskManagerSharedMem,
|
| kTaskManagerPrivateMem,
|
| @@ -81,8 +81,8 @@ static const GdkColor kHighlightColor = GDK_COLOR_RGB(0xff, 0xfa, 0xcd);
|
|
|
| TaskManagerColumn TaskManagerResourceIDToColumnID(int id) {
|
| switch (id) {
|
| - case IDS_TASK_MANAGER_PAGE_COLUMN:
|
| - return kTaskManagerPage;
|
| + case IDS_TASK_MANAGER_TASK_COLUMN:
|
| + return kTaskManagerTask;
|
| case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN:
|
| return kTaskManagerProfileName;
|
| case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
|
| @@ -117,8 +117,8 @@ TaskManagerColumn TaskManagerResourceIDToColumnID(int id) {
|
|
|
| int TaskManagerColumnIDToResourceID(int id) {
|
| switch (id) {
|
| - case kTaskManagerPage:
|
| - return IDS_TASK_MANAGER_PAGE_COLUMN;
|
| + case kTaskManagerTask:
|
| + return IDS_TASK_MANAGER_TASK_COLUMN;
|
| case kTaskManagerProfileName:
|
| return IDS_TASK_MANAGER_PROFILE_NAME_COLUMN;
|
| case kTaskManagerSharedMem:
|
| @@ -156,7 +156,7 @@ int TaskManagerColumnIDToResourceID(int id) {
|
| //
|
| // We need colid - 1 because the gtk_tree_view function is asking for the
|
| // column index, not the column id, and both kTaskManagerIcon and
|
| -// kTaskManagerPage are in the same column index, so all column IDs are off by
|
| +// kTaskManagerTask are in the same column index, so all column IDs are off by
|
| // one.
|
| int TreeViewColumnIndexFromID(TaskManagerColumn colid) {
|
| return colid - 1;
|
| @@ -233,7 +233,7 @@ class TaskManagerGtk::ContextMenuController
|
| explicit ContextMenuController(TaskManagerGtk* task_manager)
|
| : task_manager_(task_manager) {
|
| menu_model_.reset(new ui::SimpleMenuModel(this));
|
| - for (int i = kTaskManagerPage; i <= kTaskManagerLastVisibleColumn; i++) {
|
| + for (int i = kTaskManagerTask; i <= kTaskManagerLastVisibleColumn; i++) {
|
| menu_model_->AddCheckItemWithStringId(
|
| i, TaskManagerColumnIDToResourceID(i));
|
| }
|
| @@ -566,10 +566,10 @@ void TaskManagerGtk::CreateTaskManagerTreeview() {
|
| process_list_sort_ = gtk_tree_model_sort_new_with_model(
|
| GTK_TREE_MODEL(process_list_));
|
| gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
|
| - kTaskManagerPage,
|
| + kTaskManagerTask,
|
| ComparePage, this, NULL);
|
| gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
|
| - kTaskManagerPage,
|
| + kTaskManagerTask,
|
| CompareProfileName, this, NULL);
|
| gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
|
| kTaskManagerSharedMem,
|
| @@ -610,7 +610,7 @@ void TaskManagerGtk::CreateTaskManagerTreeview() {
|
| treeview_ = gtk_tree_view_new_with_model(process_list_sort_);
|
|
|
| // Insert all the columns.
|
| - TreeViewInsertColumnWithPixbuf(treeview_, IDS_TASK_MANAGER_PAGE_COLUMN);
|
| + TreeViewInsertColumnWithPixbuf(treeview_, IDS_TASK_MANAGER_TASK_COLUMN);
|
| TreeViewInsertColumnWithPixbuf(treeview_,
|
| IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
|
| TreeViewInsertColumn(treeview_, IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
|
| @@ -664,7 +664,7 @@ std::string TaskManagerGtk::GetModelText(int row, int col_id) {
|
| return std::string();
|
|
|
| switch (col_id) {
|
| - case IDS_TASK_MANAGER_PAGE_COLUMN: // Process
|
| + case IDS_TASK_MANAGER_TASK_COLUMN: // Process
|
| return UTF16ToUTF8(model_->GetResourceTitle(row));
|
|
|
| case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN: // Profile name
|
| @@ -726,10 +726,10 @@ GdkPixbuf* TaskManagerGtk::GetModelIcon(int row) {
|
|
|
| void TaskManagerGtk::SetRowDataFromModel(int row, GtkTreeIter* iter) {
|
| GdkPixbuf* icon = GetModelIcon(row);
|
| - std::string page = GetModelText(row, IDS_TASK_MANAGER_PAGE_COLUMN);
|
| + std::string task = GetModelText(row, IDS_TASK_MANAGER_TASK_COLUMN);
|
| std::string profile_name =
|
| GetModelText(row, IDS_TASK_MANAGER_PROFILE_NAME_COLUMN);
|
| - gchar* page_markup = g_markup_escape_text(page.c_str(), page.length());
|
| + gchar* task_markup = g_markup_escape_text(task.c_str(), task.length());
|
| std::string shared_mem =
|
| GetModelText(row, IDS_TASK_MANAGER_SHARED_MEM_COLUMN);
|
| std::string priv_mem = GetModelText(row, IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN);
|
| @@ -775,7 +775,7 @@ void TaskManagerGtk::SetRowDataFromModel(int row, GtkTreeIter* iter) {
|
| highlight_background_resources_;
|
| gtk_list_store_set(process_list_, iter,
|
| kTaskManagerIcon, icon,
|
| - kTaskManagerPage, page_markup,
|
| + kTaskManagerTask, task_markup,
|
| kTaskManagerProfileName, profile_name.c_str(),
|
| kTaskManagerSharedMem, shared_mem.c_str(),
|
| kTaskManagerPrivateMem, priv_mem.c_str(),
|
| @@ -793,7 +793,7 @@ void TaskManagerGtk::SetRowDataFromModel(int row, GtkTreeIter* iter) {
|
| is_background ? &kHighlightColor : NULL,
|
| -1);
|
| g_object_unref(icon);
|
| - g_free(page_markup);
|
| + g_free(task_markup);
|
| }
|
|
|
| void TaskManagerGtk::KillSelectedProcesses() {
|
|
|