Move app/mac/ files to ui/gfx/mac/ directory.

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

 // Copyright (c) 2011 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 <AppKit/AppKit.h>
 
-#include "app/mac/nsimage_cache.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/mac/nsimage_cache.h"
 
 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile)
     : menuIsValid_(false),
       profile_(profile),
       controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this]) {
   if (GetBookmarkModel())
     ObserveBookmarkModel();
 }
 
 BookmarkMenuBridge::~BookmarkMenuBridge() {
@@ skipping 258 matching lines @@
   NSImage* favicon = nil;
   BookmarkModel* model = GetBookmarkModel();
   if (model) {
     const SkBitmap& bitmap = model->GetFavicon(node);
     if (!bitmap.isNull())
       favicon = gfx::SkBitmapToNSImage(bitmap);
   }
   // Either we do not have a loaded favicon or the conversion from SkBitmap
   // failed. Use the default site image instead.
   if (!favicon)
-    favicon = app::mac::GetCachedImageWithName(@"nav.pdf");
+    favicon = gfx::GetCachedImageWithName(@"nav.pdf");
   [item setImage:favicon];
 }
 
 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {
   if (!node)
     return nil;
   std::map<const BookmarkNode*, NSMenuItem*>::iterator it =
       bookmark_nodes_.find(node);
   if (it == bookmark_nodes_.end())
     return nil;
   return it->second;
 }