Remove "View Background Pages".

chrome/browser/ui/gtk/task_manager_gtk.cc

 // Copyright (c) 2012 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/ui/gtk/task_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 53 matching lines @@
   kTaskManagerNetwork,
   kTaskManagerProcessID,
   kTaskManagerJavaScriptMemory,
   kTaskManagerWebCoreImageCache,
   kTaskManagerWebCoreScriptsCache,
   kTaskManagerWebCoreCssCache,
   kTaskManagerVideoMemory,
   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:
       return kTaskManagerTask;
     case IDS_TASK_MANAGER_PROFILE_NAME_COLUMN:
       return kTaskManagerProfileName;
     case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:
       return kTaskManagerSharedMem;
     case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:
       return kTaskManagerPrivateMem;
@@ skipping 93 matching lines @@
 void TreeViewInsertTaskColumn(GtkWidget* treeview, int resid) {
   int colid = TaskManagerResourceIDToColumnID(resid);
   GtkTreeViewColumn* column = gtk_tree_view_column_new();
   gtk_tree_view_column_set_title(column,
                                  l10n_util::GetStringUTF8(resid).c_str());
   gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(treeview), colid);
   GtkCellRenderer* image_renderer = gtk_cell_renderer_pixbuf_new();
   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);
   gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
   gtk_tree_view_column_set_sort_column_id(column, colid);
 }
 
 // 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,
-      "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);
   gtk_tree_view_column_set_sort_column_id(column, colid);
 }
 
 // Loads the column name from |resid| and uses the corresponding
 // TaskManagerColumn value as the column id to insert into the treeview.
 void TreeViewInsertColumn(GtkWidget* treeview, int resid) {
@@ skipping 76 matching lines @@
   scoped_ptr<ui::SimpleMenuModel> menu_model_;
   scoped_ptr<MenuGtk> menu_;
 
   // The TaskManager the context menu was brought up for. Set to NULL when the
   // menu is canceled.
   TaskManagerGtk* task_manager_;
 
   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();
 }
 
 // static
 TaskManagerGtk* TaskManagerGtk::instance_ = NULL;
 
 TaskManagerGtk::~TaskManagerGtk() {
   model_->RemoveObserver(this);
   task_manager_->OnWindowClosed();
 
@@ skipping 83 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerGtk, public:
 
 void TaskManagerGtk::Close() {
   // Blow away our dialog - this will cause TaskManagerGtk to free itself.
   gtk_widget_destroy(dialog_);
   DCHECK(!instance_);
 }
 
 // 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();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerGtk, private:
 
 void TaskManagerGtk::Init() {
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_TASK_MANAGER_TITLE).c_str(),
@@ skipping 124 matching lines @@
                           GDK_w, GDK_CONTROL_MASK, GtkAccelFlags(0),
                           g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk),
                                          this, NULL));
 }
 
 void TaskManagerGtk::CreateTaskManagerTreeview() {
   process_list_ = gtk_list_store_new(kTaskManagerColumnCount,
       GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
       G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
       G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-      G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_COLOR);
+      G_TYPE_STRING, G_TYPE_STRING);
 
   // Support sorting on all columns.
   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_),
                                   kTaskManagerTask,
                                   ComparePage, this, NULL);
   gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(process_list_sort_),
                                   kTaskManagerTask,
                                   CompareProfileName, this, NULL);
@@ skipping 131 matching lines @@
     fps = GetModelText(row, IDS_TASK_MANAGER_FPS_COLUMN);
   std::string sqlite_memory;
   if (TreeViewColumnIsVisible(treeview_, kTaskManagerSqliteMemoryUsed)) {
     sqlite_memory =
         GetModelText(row, IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
   }
 
   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,
                      kTaskManagerProfileName, profile_name.c_str(),
                      kTaskManagerSharedMem, shared_mem.c_str(),
                      kTaskManagerPrivateMem, priv_mem.c_str(),
                      kTaskManagerCPU, cpu.c_str(),
                      kTaskManagerNetwork, net.c_str(),
                      kTaskManagerProcessID, procid.c_str(),
                      kTaskManagerJavaScriptMemory, javascript_memory.c_str(),
                      kTaskManagerWebCoreImageCache, wk_img_cache.c_str(),
                      kTaskManagerWebCoreScriptsCache, wk_scripts_cache.c_str(),
                      kTaskManagerWebCoreCssCache, wk_css_cache.c_str(),
                      kTaskManagerVideoMemory, video_memory.c_str(),
                      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);
 }
 
 void TaskManagerGtk::KillSelectedProcesses() {
   GtkTreeSelection* selection = gtk_tree_view_get_selection(
       GTK_TREE_VIEW(treeview_));
 
   GtkTreeModel* model;
@@ skipping 192 matching lines @@
     // is destroyed.  The deleted object will receive gtk signals otherwise.
     gtk_dialog_response(GTK_DIALOG(dialog_), GTK_RESPONSE_DELETE_EVENT);
   }
 
   return TRUE;
 }
 
 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