Remove the TableRowNSImageCache.

chrome/browser/ui/cocoa/task_manager_mac.mm

 // 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/cocoa/task_manager_mac.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/mac/bundle_locations.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/task_management/task_manager_interface.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
 
 namespace {
 
 // Width of "a" and most other letters/digits in "small" table views.
 const int kCharWidth = 6;
 
 // Some of the strings below have spaces at the end or are missing letters, to
 // make the columns look nicer, and to take potentially longer localized strings
 // into account.
 const struct ColumnWidth {
@@ skipping 467 matching lines @@
   [self reloadData];  // Sorts.
 }
 
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerMac implementation:
 
 TaskManagerMac::TaskManagerMac(TaskManager* task_manager)
   : task_manager_(task_manager),
-    model_(task_manager->model()),
-    icon_cache_(this) {
+    model_(task_manager->model()) {
   window_controller_ =
       [[TaskManagerWindowController alloc] initWithTaskManagerObserver:this];
   model_->AddObserver(this);
 }
 
 // static
 TaskManagerMac* TaskManagerMac::instance_ = NULL;
 
 TaskManagerMac::~TaskManagerMac() {
   if (this == instance_) {
     // Do not do this when running in unit tests: |StartUpdating()| never got
     // called in that case.
     task_manager_->OnWindowClosed();
   }
   model_->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerMac, TaskManagerModelObserver implementation:
 
 void TaskManagerMac::OnModelChanged() {
-  icon_cache_.OnModelChanged();
   [window_controller_ deselectRows];
   [window_controller_ reloadData];
 }
 
 void TaskManagerMac::OnItemsChanged(int start, int length) {
-  icon_cache_.OnItemsChanged(start, length);
   [window_controller_ reloadData];
 }
 
 void TaskManagerMac::OnItemsAdded(int start, int length) {
-  icon_cache_.OnItemsAdded(start, length);
   [window_controller_ deselectRows];
   [window_controller_ reloadData];
 }
 
 void TaskManagerMac::OnItemsRemoved(int start, int length) {
-  icon_cache_.OnItemsRemoved(start, length);
   [window_controller_ deselectRows];
   [window_controller_ reloadData];
 }
 
 NSImage* TaskManagerMac::GetImageForRow(int row) {
-  return icon_cache_.GetImageForRow(row);
+  return gfx::NSImageFromImageSkia(model_->GetResourceIcon(row));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerMac, public:
 
 void TaskManagerMac::WindowWasClosed() {
   delete this;
   instance_ = NULL;  // |instance_| is static
 }
 
-int TaskManagerMac::RowCount() const {
-  return model_->ResourceCount();
-}
-
-gfx::ImageSkia TaskManagerMac::GetIcon(int r) const {
-  return model_->GetResourceIcon(r);
-}
-
 // static
 void TaskManagerMac::Show() {
   if (instance_) {
     [[instance_->window_controller_ window]
       makeKeyAndOrderFront:instance_->window_controller_];
     return;
   }
   // Create a new instance.
   instance_ = new TaskManagerMac(TaskManager::GetInstance());
   instance_->model_->StartUpdating();
@@ skipping 29 matching lines @@
                                    int64_t bytes_read) {
   if (task_management::TaskManagerInterface::IsNewTaskManagerEnabled())
     return false;
 
   TaskManager::GetInstance()->model()->NotifyBytesRead(request, bytes_read);
   return true;
 }
 
 }  // namespace chrome