Remove "View Background Pages".

chrome/browser/ui/gtk/task_manager_gtk.cc

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 c765e3e011123d25219372168055517ef249eaf5..d93d3c21ebfd2ab00ab6356e055288af00adb598 100644
--- a/chrome/browser/ui/gtk/task_manager_gtk.cc
+++ b/chrome/browser/ui/gtk/task_manager_gtk.cc
@@ -71,16 +71,12 @@ enum TaskManagerColumn {
   kTaskManagerFPS,
   kTaskManagerSqliteMemoryUsed,
   kTaskManagerGoatsTeleported,
-  // Columns below this point are not visible in the task manager.
-  kTaskManagerBackgroundColor,
   kTaskManagerColumnCount,
 };
 
 const TaskManagerColumn kTaskManagerLastVisibleColumn =
     kTaskManagerGoatsTeleported;
 
-static const GdkColor kHighlightColor = GDK_COLOR_RGB(0xff, 0xfa, 0xcd);
-
 TaskManagerColumn TaskManagerResourceIDToColumnID(int id) {
   switch (id) {
     case IDS_TASK_MANAGER_TASK_COLUMN:
@@ -194,15 +190,9 @@ void TreeViewInsertTaskColumn(GtkWidget* treeview, int resid) {
   gtk_tree_view_column_pack_start(column, image_renderer, FALSE);
   gtk_tree_view_column_add_attribute(column, image_renderer,
                                      "pixbuf", kTaskManagerIcon);
-  gtk_tree_view_column_add_attribute(column, image_renderer,
-                                     "cell-background-gdk",
-                                     kTaskManagerBackgroundColor);
   GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_column_pack_start(column, text_renderer, TRUE);
   gtk_tree_view_column_add_attribute(column, text_renderer, "markup", colid);
-  gtk_tree_view_column_add_attribute(column, text_renderer,
-                                     "cell-background-gdk",
-                                     kTaskManagerBackgroundColor);
   gtk_tree_view_column_set_resizable(column, TRUE);
   // This is temporary: we'll turn expanding off after getting the size.
   gtk_tree_view_column_set_expand(column, TRUE);
@@ -213,13 +203,6 @@ void TreeViewInsertTaskColumn(GtkWidget* treeview, int resid) {
 // Inserts a column with a column id of |colid| and |name|.
 void TreeViewInsertColumnWithName(GtkWidget* treeview,
                                   TaskManagerColumn colid, const char* name) {
-  GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(
-      GTK_TREE_VIEW(treeview), -1,
-      name, renderer,
-      "text", colid,

[Elliot Glaysher, 2013/06/21 20:51:49]

Maybe this is what went wrong? Is "text" still a used column? (This is a
variadic function which takes as many things to update as it can...)

[Avi (use Gerrit), 2013/06/21 20:57:38]

Oh, that's a variadic function. Oooooops.

-      "cell-background-gdk", kTaskManagerBackgroundColor,
-      NULL);
   GtkTreeViewColumn* column = gtk_tree_view_get_column(
       GTK_TREE_VIEW(treeview), TreeViewColumnIndexFromID(colid));
   gtk_tree_view_column_set_resizable(column, TRUE);
@@ -315,15 +298,14 @@ class TaskManagerGtk::ContextMenuController
   DISALLOW_COPY_AND_ASSIGN(ContextMenuController);
 };
 
-TaskManagerGtk::TaskManagerGtk(bool highlight_background_resources)
+TaskManagerGtk::TaskManagerGtk()
   : task_manager_(TaskManager::GetInstance()),
     model_(TaskManager::GetInstance()->model()),
     dialog_(NULL),
     treeview_(NULL),
     process_list_(NULL),
     process_count_(0),
-    ignore_selection_changed_(false),
-    highlight_background_resources_(highlight_background_resources) {
+    ignore_selection_changed_(false) {
   Init();
 }
 
@@ -427,19 +409,12 @@ void TaskManagerGtk::Close() {
 }
 
 // static
-void TaskManagerGtk::Show(bool highlight_background_resources) {
-  if (instance_ &&
-      instance_->highlight_background_resources_ !=
-          highlight_background_resources) {
-    instance_->Close();
-    DCHECK(!instance_);
-  }
-
+void TaskManagerGtk::Show() {
   if (instance_) {
     // If there's a Task manager window open already, just activate it.
     gtk_util::PresentWindow(instance_->dialog_, 0);
   } else {
-    instance_ = new TaskManagerGtk(highlight_background_resources);
+    instance_ = new TaskManagerGtk();
     instance_->model_->StartUpdating();
   }
 }
@@ -736,8 +711,6 @@ void TaskManagerGtk::SetRowDataFromModel(int row, GtkTreeIter* iter) {
   std::string goats =
       GetModelText(row, IDS_TASK_MANAGER_GOATS_TELEPORTED_COLUMN);
 
-  bool is_background = model_->IsBackgroundResource(row) &&
-      highlight_background_resources_;
   gtk_list_store_set(process_list_, iter,
                      kTaskManagerIcon, icon,
                      kTaskManagerTask, task_markup,
@@ -755,8 +728,6 @@ void TaskManagerGtk::SetRowDataFromModel(int row, GtkTreeIter* iter) {
                      kTaskManagerFPS, fps.c_str(),
                      kTaskManagerSqliteMemoryUsed, sqlite_memory.c_str(),
                      kTaskManagerGoatsTeleported, goats.c_str(),
-                     kTaskManagerBackgroundColor,
-                     is_background ? &kHighlightColor : NULL,
                      -1);
   g_object_unref(icon);
   g_free(task_markup);
@@ -969,8 +940,8 @@ gboolean TaskManagerGtk::OnGtkAccelerator(GtkAccelGroup* accel_group,
 namespace chrome {
 
 // Declared in browser_dialogs.h.
-void ShowTaskManager(Browser* browser, bool highlight_background_resources) {
-  TaskManagerGtk::Show(highlight_background_resources);
+void ShowTaskManager(Browser* browser) {
+  TaskManagerGtk::Show();
 }
 
 }  // namespace chrome