Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update calling code.

Remove unnecessary refs to NullableString from render_thread.*

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5961007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69973 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index 7720c90..b86aab9 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -4,8 +4,8 @@
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 
+#include "app/mac/nsimage_cache.h"
 #include "base/mac_util.h"
-#include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -131,7 +131,7 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
     barController_ = barController;  // WEAK
     buttons_.reset([[NSMutableArray alloc] init]);
     folderTarget_.reset([[BookmarkFolderTarget alloc] initWithController:self]);
-    NSImage* image = nsimage_cache::ImageNamed(@"menu_overflow_up.pdf");
+    NSImage* image = app::mac::GetCachedImageWithName(@"menu_overflow_up.pdf");
     DCHECK(image);
     verticalScrollArrowHeight_ = [image size].height;
     [self configureWindow];
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
index 0915188..65cb664 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm
@@ -5,7 +5,7 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
 
 #import "base/logging.h"
-#include "base/nsimage_cache_mac.h"
+#include "app/mac/nsimage_cache.h"
 #import "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
@@ -41,10 +41,10 @@ const CGFloat kViewCornerRadius = 4.0;
 @implementation BookmarkBarFolderWindowContentView
 
 - (void)awakeFromNib {
-  arrowUpImage_.reset([nsimage_cache::ImageNamed(@"menu_overflow_up.pdf")
-                                    retain]);
-  arrowDownImage_.reset([nsimage_cache::ImageNamed(@"menu_overflow_down.pdf")
-                                      retain]);
+  arrowUpImage_.reset(
+      [app::mac::GetCachedImageWithName(@"menu_overflow_up.pdf") retain]);
+  arrowDownImage_.reset(
+      [app::mac::GetCachedImageWithName(@"menu_overflow_down.pdf") retain]);
 }
 
 // Draw the arrows at the top and bottom of the folder window as a
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
index 969a829..a78d627 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
@@ -5,8 +5,8 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 
 #include "app/l10n_util_mac.h"
+#include "app/mac/nsimage_cache.h"
 #include "base/logging.h"
-#include "base/nsimage_cache_mac.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -203,8 +203,8 @@
 - (void)setDrawFolderArrow:(BOOL)draw {
   drawFolderArrow_ = draw;
   if (draw && !arrowImage_) {
-    arrowImage_.reset([nsimage_cache::ImageNamed(@"menu_hierarchy_arrow.pdf")
-                                    retain]);
+    arrowImage_.reset(
+        [app::mac::GetCachedImageWithName(@"menu_hierarchy_arrow.pdf") retain]);
   }
 }
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
index 2918b5f..3792fe3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -6,7 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/nsimage_cache_mac.h"
+#include "app/mac/nsimage_cache.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -238,7 +238,7 @@ void BookmarkMenuBridge::ConfigureMenuItem(const BookmarkNode* node,
   // Either we do not have a loaded favicon or the conversion from SkBitmap
   // failed. Use the default site image instead.
   if (!favicon)
-    favicon = nsimage_cache::ImageNamed(@"nav.pdf");
+    favicon = app::mac::GetCachedImageWithName(@"nav.pdf");
   [item setImage:favicon];
 }