Move webcursors code from webkit/ to content.

content/common/cursors/webcursor_mac.mm

 // Copyright (c) 2012 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.
 
-#include "webkit/common/cursors/webcursor.h"
+#include "content/common/cursors/webcursor.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
+#include "content/public/common/content_client.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/size_conversions.h"
 
 
 using blink::WebCursorInfo;
 using blink::WebSize;
 
 // Declare symbols that are part of the 10.7 SDK.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
@@ skipping 82 matching lines @@
 - (CrCoreCursorType)_coreCursorType {
   return type_;
 }
 
 @end
 
 namespace {
 
 NSCursor* LoadCursor(int resource_id, int hotspot_x, int hotspot_y) {
   const gfx::Image& cursor_image =
-      ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
+      content::GetContentClient()->GetNativeImageNamed(resource_id);
   DCHECK(!cursor_image.IsEmpty());
   return [[[NSCursor alloc] initWithImage:cursor_image.ToNSImage()
                                   hotSpot:NSMakePoint(hotspot_x,
                                                       hotspot_y)] autorelease];
 }
 
 // Gets a specified cursor from CoreCursor, falling back to loading it from the
 // image cache if CoreCursor cannot provide it.
 NSCursor* GetCoreCursorWithFallback(CrCoreCursorType type,
                                     int resource_id,
@@ skipping 53 matching lines @@
   [[[cursor_image representations] objectAtIndex:0] setSize:dip_size];
 
   NSCursor* cursor = [[NSCursor alloc] initWithImage:cursor_image
                                              hotSpot:dip_hotspot];
 
   return [cursor autorelease];
 }
 
 }  // namespace
 
+namespace content {
+
 // Match Safari's cursor choices; see platform/mac/CursorMac.mm .
 gfx::NativeCursor WebCursor::GetNativeCursor() {
   switch (type_) {
     case WebCursorInfo::TypePointer:
       return [NSCursor arrowCursor];
     case WebCursorInfo::TypeCross:
       return [NSCursor crosshairCursor];
     case WebCursorInfo::TypeHand:
       // If >= 10.7, the pointingHandCursor has a shadow so use it. Otherwise
       // use the custom one.
@@ skipping 183 matching lines @@
   return true;
 }
 
 void WebCursor::CleanupPlatformData() {
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   return;
 }
+
+}  // namespace content