Revert r135533.

ui/base/x/x11_util.h

 // 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.
 
 #ifndef UI_BASE_X_X11_UTIL_H_
 #define UI_BASE_X_X11_UTIL_H_
 #pragma once
 
 // This file declares utility functions for X11 (Linux only).
 //
 // These functions do not require the Xlib headers to be included (which is why
 // we use a void* for Visual*). The Xlib headers are highly polluting so we try
 // hard to limit their spread into the rest of the code.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "ui/base/events.h"
 #include "ui/base/ui_export.h"
-#include "ui/gfx/point.h"
 
 typedef unsigned long Atom;
 typedef unsigned long XID;
 typedef unsigned long XSharedMemoryId;  // ShmSeg in the X headers.
 typedef struct _XDisplay Display;
 typedef unsigned long Cursor;
 typedef struct _XcursorImage XcursorImage;
 
 #if defined(TOOLKIT_GTK)
 typedef struct _GdkDrawable GdkWindow;
 typedef struct _GtkWidget GtkWidget;
 typedef struct _GtkWindow GtkWindow;
 #endif
 
 namespace gfx {
 class Rect;
 }
-class SkBitmap;
 
 namespace ui {
 
 // These functions use the GDK default display and this /must/ be called from
 // the UI thread. Thus, they don't support multiple displays.
 
 // These functions cache their results ---------------------------------
 
 // Check if there's an open connection to an X server.
 UI_EXPORT bool XDisplayExists();
@@ skipping 34 matching lines @@
 // Creates a custom X cursor from the image. This takes ownership of image. The
 // caller must not free/modify the image. The refcount of the newly created
 // cursor is set to 1.
 UI_EXPORT ::Cursor CreateReffedCustomXCursor(XcursorImage* image);
 
 // Increases the refcount of the custom cursor.
 UI_EXPORT void RefCustomXCursor(::Cursor cursor);
 
 // Decreases the refcount of the custom cursor, and destroys it if it reaches 0.
 UI_EXPORT void UnrefCustomXCursor(::Cursor cursor);
-
-// Creates a XcursorImage and copies the SkBitmap |bitmap| on it. |bitmap|
-// should be non-null. Caller owns the returned object.
-UI_EXPORT XcursorImage* SkBitmapToXcursorImage(const SkBitmap* bitmap,
-                                               const gfx::Point& hotspot);
 #endif
 
 // These functions do not cache their results --------------------------
 
 // Get the X window id for the default root window
 UI_EXPORT XID GetX11RootWindow();
 
 // Returns the user's current desktop.
 bool GetCurrentDesktop(int* desktop);
 
@@ skipping 178 matching lines @@
 
  private:
   char* string_;
 
   DISALLOW_COPY_AND_ASSIGN(XScopedString);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_X_X11_UTIL_H_