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

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm

 // Copyright (c) 2010 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.
 
 #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"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #include "grit/generated_resources.h"
 
 
 @interface BookmarkButtonCell(Private)
@@ skipping 176 matching lines @@
 
 // See comment above mouseEntered:, above.
 - (void)mouseExited:(NSEvent*)event {
   [[self controlView] mouseExited:event];
   [super mouseExited:event];
 }
 
 - (void)setDrawFolderArrow:(BOOL)draw {
   drawFolderArrow_ = draw;
   if (draw && !arrowImage_) {
-    arrowImage_.reset([nsimage_cache::ImageNamed(@"menu_hierarchy_arrow.pdf")
-                                    retain]);
+    arrowImage_.reset([

[Avi (use Gerrit), 2010/12/22 19:06:38]

You can't break at the bracket: [object message] is a unit. Break between the (
and [.

+        app::mac::GetCachedImageWithName(@"menu_hierarchy_arrow.pdf")
+        retain]);
   }
 }
 
 // Add extra size for the arrow so it doesn't overlap the text.
 // Does not sanity check to be sure this is actually a folder node.
 - (NSSize)cellSize {
   NSSize cellSize = [super cellSize];
   if (drawFolderArrow_) {
     cellSize.width += [arrowImage_ size].width;  // plus margin?
   }
@@ skipping 19 matching lines @@
                                    (NSHeight(imageRect) / 2.0));
     [arrowImage_ drawInRect:drawRect
                     fromRect:imageRect
                    operation:NSCompositeSourceOver
                     fraction:[self isEnabled] ? 1.0 : 0.5
                 neverFlipped:YES];
   }
 }
 
 @end