Move ash specific cursor code to CursorManager.

ui/base/cursor/cursor_loader_x11.h

Index: ui/base/cursor/cursor_loader_x11.h
diff --git a/ui/base/cursor/cursor_loader_x11.h b/ui/base/cursor/cursor_loader_x11.h
new file mode 100644
index 0000000000000000000000000000000000000000..9d950283a333b020f5c90d415859a301034ac498
--- /dev/null
+++ b/ui/base/cursor/cursor_loader_x11.h
@@ -0,0 +1,55 @@
+// 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_CURSOR_CURSOR_LOADER_X11_H_
+#define UI_BASE_CURSOR_CURSOR_LOADER_X11_H_
+
+#include <X11/Xcursor/Xcursor.h>
+#include <map>
+
+#include "base/compiler_specific.h"
+#include "ui/base/cursor/cursor.h"
+#include "ui/base/cursor/cursor_loader.h"
+
+namespace ui {
+
+class CursorLoaderX11 : public CursorLoader {
+ public:
+  CursorLoaderX11();
+  virtual ~CursorLoaderX11();
+
+  // Overridden from CursorLoader:
+  virtual void LoadImageCursor(
+      int id, int resource_id, const gfx::Point& hot) OVERRIDE;
+  virtual void LoadAnimatedCursor(
+      int id, int resource_id, const gfx::Point& hot,
+      int frame_delay_ms) OVERRIDE;
+  virtual void UnloadAll() OVERRIDE;
+  virtual void SetPlatformCursor(gfx::NativeCursor* cursor) OVERRIDE;
+ private:

[sky, 2012/09/10 22:49:06]

newline between 29/30

[mazda, 2012/09/11 00:45:09]

Done.

+  // Returns true if we have an image resource loaded for the |native_cursor|.
+  bool IsImageCursor(gfx::NativeCursor native_cursor);
+
+  // Gets the X Cursor corresponding to the |native_cursor|.
+  ::Cursor ImageCursorFromNative(gfx::NativeCursor native_cursor);
+
+  // A map to hold all image cursors. It maps the cursor ID to the X Cursor.
+  typedef std::map<int, ::Cursor> ImageCursorMap;
+  ImageCursorMap cursors_;
+
+  // A map to hold all animated cursors. It maps the cursor ID to the pair of
+  // the X Cursor and the corresponding XcursorImages. We need a pointer to the
+  // images so that we can free them on destruction.
+  typedef std::map<int, std::pair< ::Cursor, XcursorImages*> >
+      AnimatedCursorMap;
+  AnimatedCursorMap animated_cursors_;
+
+  ::Cursor invisible_cursor_;
+
+  DISALLOW_COPY_AND_ASSIGN(CursorLoaderX11);
+};
+
+}  // namespace ui
+
+#endif  // UI_BASE_CURSOR_CURSOR_LOADER_X11_H_