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

chrome/browser/ui/cocoa/toolbar_controller.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/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
+#include "app/mac/nsimage_cache.h"
 #include "app/menus/accelerator_cocoa.h"
 #include "app/menus/menu_model.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
-#include "base/nsimage_cache_mac.h"
 #include "base/singleton.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 190 matching lines @@
 }
 
 // Called after the view is done loading and the outlets have been hooked up.
 // Now we can hook up bridges that rely on UI objects such as the location
 // bar and button state.
 - (void)awakeFromNib {
   // A bug in AppKit (<rdar://7298597>, <http://openradar.me/7298597>) causes
   // images loaded directly from nibs in a framework to not get their "template"
   // flags set properly. Thus, despite the images being set on the buttons in
   // the xib, we must set them in code.
-  [backButton_ setImage:nsimage_cache::ImageNamed(kBackButtonImageName)];
-  [forwardButton_ setImage:nsimage_cache::ImageNamed(kForwardButtonImageName)];
+  [backButton_ setImage:app::mac::GetCachedImageWithName(kBackButtonImageName)];
+  [forwardButton_
+      setImage:app::mac::GetCachedImageWithName(kForwardButtonImageName)];

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

Break after setImage: here and next three times

   [reloadButton_
-      setImage:nsimage_cache::ImageNamed(kReloadButtonReloadImageName)];
-  [homeButton_ setImage:nsimage_cache::ImageNamed(kHomeButtonImageName)];
-  [wrenchButton_ setImage:nsimage_cache::ImageNamed(kWrenchButtonImageName)];
+      setImage:app::mac::GetCachedImageWithName(kReloadButtonReloadImageName)];
+  [homeButton_ setImage:app::mac::GetCachedImageWithName(kHomeButtonImageName)];
+  [wrenchButton_
+      setImage:app::mac::GetCachedImageWithName(kWrenchButtonImageName)];
 
   if (UpgradeDetector::GetInstance()->notify_upgrade())
     [self badgeWrenchMenu];
 
   [backButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [forwardButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [reloadButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [homeButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [wrenchButton_ setShowsBorderOnlyWhileMouseInside:YES];
 
@@ skipping 280 matching lines @@
   [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]];
 }
 
 - (WrenchMenuController*)wrenchMenuController {
   return wrenchMenuController_;
 }
 
 - (void)badgeWrenchMenu {
   NSImage* badge = ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_UPDATE_BADGE);
-  NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName);
+  NSImage* wrenchImage =
+      app::mac::GetCachedImageWithName(kWrenchButtonImageName);
   NSSize wrenchImageSize = [wrenchImage size];
 
   scoped_nsobject<NSImage> overlayImage(
       [[NSImage alloc] initWithSize:wrenchImageSize]);
 
   [overlayImage lockFocus];
   [badge drawAtPoint:NSZeroPoint
             fromRect:NSZeroRect
            operation:NSCompositeSourceOver
             fraction:1.0];
@@ skipping 220 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end