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

chrome/browser/ui/cocoa/browser_window_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/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
+#include "app/mac/scoped_nsdisable_screen_updates.h"
+#include "app/mac/nsimage_cache.h"
 #include "base/mac_util.h"
-#include "app/mac/scoped_nsdisable_screen_updates.h"
-#include "base/nsimage_cache_mac.h"
 #import "base/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"  // IDC_*
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 1552 matching lines @@
 // If the browser is in incognito mode, install the image view to decorate
 // the window at the upper right. Use the same base y coordinate as the
 // tab strip.
 - (void)installIncognitoBadge {
   // Only install if this browser window is OTR and has a tab strip.
   if (!browser_->profile()->IsOffTheRecord() || ![self hasTabStrip])
     return;
 
   // Install the image into the badge view and size the view appropriately.
   // Hide it for now; positioning and showing will be done by the layout code.
-  NSImage* image = nsimage_cache::ImageNamed(@"otr_icon.pdf");
+  NSImage* image = app::mac::GetCachedImageWithName(@"otr_icon.pdf");
   incognitoBadge_.reset([[IncognitoImageView alloc] init]);
   [incognitoBadge_ setImage:image];
   [incognitoBadge_ setFrameSize:[image size]];
   [incognitoBadge_ setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
   [incognitoBadge_ setHidden:YES];
 
   // Install the view.
   [[[[self window] contentView] superview] addSubview:incognitoBadge_];
 }
 
@@ skipping 482 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)