Move webcursors code from webkit/ to content.

content/common/cursors/webcursor_gtk.cc

 // 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"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "ui/gfx/gtk_util.h"
 
 using blink::WebCursorInfo;
 
 namespace {
 
 // webcursor_gtk_data.h is taken directly from WebKit's CursorGtk.h.
-#include "webkit/common/cursors/webcursor_gtk_data.h"
+#include "content/common/cursors/webcursor_gtk_data.h"
 
 // This helper function is taken directly from WebKit's CursorGtk.cpp.
 // It attempts to create a custom cursor from the data inlined in
 // webcursor_gtk_data.h.
 GdkCursor* GetInlineCustomCursor(CustomCursorType type) {
   static GdkCursor* CustomCursorsGdk[G_N_ELEMENTS(CustomCursors)];
   GdkCursor* cursor = CustomCursorsGdk[type];
   if (cursor)
     return cursor;
   const CustomCursor& custom = CustomCursors[type];
   cursor = gdk_cursor_new_from_name(gdk_display_get_default(), custom.name);
   if (!cursor) {
     const GdkColor fg = { 0, 0, 0, 0 };
     const GdkColor bg = { 65535, 65535, 65535, 65535 };
     GdkPixmap* source = gdk_bitmap_create_from_data(
       NULL, reinterpret_cast<const gchar*>(custom.bits), 32, 32);
     GdkPixmap* mask = gdk_bitmap_create_from_data(
       NULL, reinterpret_cast<const gchar*>(custom.mask_bits), 32, 32);
     cursor = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg,
                                         custom.hot_x, custom.hot_y);
     g_object_unref(source);
     g_object_unref(mask);
   }
   CustomCursorsGdk[type] = cursor;
   return cursor;
 }
 
-}  // end anonymous namespace
+}  // namespace
+
+namespace content {
 
 int WebCursor::GetCursorType() const {
   // http://library.gnome.org/devel/gdk/2.12/gdk-Cursors.html has images
   // of the default X theme, but beware that the user's cursor theme can
   // change everything.
   switch (type_) {
     case WebCursorInfo::TypePointer:
       return GDK_LAST_CURSOR;
     case WebCursorInfo::TypeCross:
       return GDK_CROSS;
@@ skipping 155 matching lines @@
     unref_ = NULL;
   }
   return;
 }
 
 void WebCursor::CopyPlatformData(const WebCursor& other) {
   if (other.unref_)
     unref_ = gdk_cursor_ref(other.unref_);
   return;
 }
+
+}  // namespace content