Make cursors work on win aura.

ui/aura/root_window_host_win.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 "ui/aura/root_window_host_win.h"
 
 #include <windows.h>
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
+#include "ui/base/cursor/cursor_loader_win.h"
 #include "ui/base/events/event.h"
 #include "ui/base/view_prop.h"
 
 using std::max;
 using std::min;
 
 namespace aura {
 
 namespace {
 
 const char* kRootWindowHostWinKey = "__AURA_ROOT_WINDOW_HOST_WIN__";
 
-// TODO(mazda): Move the cursor code to ui/base/cursor/cursor_loader_win.{cc,h}.
-const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) {
-  switch (native_cursor.native_type()) {
-    case ui::kCursorNull:
-      return IDC_ARROW;
-    case ui::kCursorPointer:
-      return IDC_ARROW;
-    case ui::kCursorCross:
-      return IDC_CROSS;
-    case ui::kCursorHand:
-      return IDC_HAND;
-    case ui::kCursorIBeam:
-      return IDC_IBEAM;
-    case ui::kCursorWait:
-      return IDC_WAIT;
-    case ui::kCursorHelp:
-      return IDC_HELP;
-    case ui::kCursorEastResize:
-      return IDC_SIZEWE;
-    case ui::kCursorNorthResize:
-      return IDC_SIZENS;
-    case ui::kCursorNorthEastResize:
-      return IDC_SIZENESW;
-    case ui::kCursorNorthWestResize:
-      return IDC_SIZENWSE;
-    case ui::kCursorSouthResize:
-      return IDC_SIZENS;
-    case ui::kCursorSouthEastResize:
-      return IDC_SIZENWSE;
-    case ui::kCursorSouthWestResize:
-      return IDC_SIZENESW;
-    case ui::kCursorWestResize:
-      return IDC_SIZEWE;
-    case ui::kCursorNorthSouthResize:
-      return IDC_SIZENS;
-    case ui::kCursorEastWestResize:
-      return IDC_SIZEWE;
-    case ui::kCursorNorthEastSouthWestResize:
-      return IDC_SIZENESW;
-    case ui::kCursorNorthWestSouthEastResize:
-      return IDC_SIZENWSE;
-    case ui::kCursorMove:
-      return IDC_SIZEALL;
-    case ui::kCursorProgress:
-      return IDC_APPSTARTING;
-    case ui::kCursorNoDrop:
-      return IDC_NO;
-    case ui::kCursorNotAllowed:
-      return IDC_NO;
-    case ui::kCursorColumnResize:
-    case ui::kCursorRowResize:
-    case ui::kCursorMiddlePanning:
-    case ui::kCursorEastPanning:
-    case ui::kCursorNorthPanning:
-    case ui::kCursorNorthEastPanning:
-    case ui::kCursorNorthWestPanning:
-    case ui::kCursorSouthPanning:
-    case ui::kCursorSouthEastPanning:
-    case ui::kCursorSouthWestPanning:
-    case ui::kCursorWestPanning:
-    case ui::kCursorVerticalText:
-    case ui::kCursorCell:
-    case ui::kCursorContextMenu:
-    case ui::kCursorAlias:
-    case ui::kCursorCopy:
-    case ui::kCursorNone:
-    case ui::kCursorZoomIn:
-    case ui::kCursorZoomOut:
-    case ui::kCursorGrab:
-    case ui::kCursorGrabbing:
-    case ui::kCursorCustom:
-      // TODO(jamescook): Should we use WebKit glue resources for these?
-      // Or migrate those resources to someplace ui/aura can share?
-      NOTIMPLEMENTED();
-      return IDC_ARROW;
-    default:
-      NOTREACHED();
-      return IDC_ARROW;
-  }
-}
-
 }  // namespace
 
 // static
 RootWindowHost* RootWindowHost::Create(RootWindowHostDelegate* delegate,
                                        const gfx::Rect& bounds) {
   return new RootWindowHostWin(delegate, bounds);
 }
 
 // static
 RootWindowHost* RootWindowHost::GetForAcceleratedWidget(
@@ skipping 107 matching lines @@
   RECT r;
   GetClientRect(hwnd(), &r);
   return gfx::Point(r.left, r.top);
 }
 
 
 void RootWindowHostWin::SetCursor(gfx::NativeCursor native_cursor) {
   // Custom web cursors are handled directly.
   if (native_cursor == ui::kCursorCustom)
     return;
-  const wchar_t* cursor_id = GetCursorId(native_cursor);
-  // TODO(jamescook): Support for non-system cursors will require finding
-  // the appropriate module to pass to LoadCursor().
-  ::SetCursor(LoadCursor(NULL, cursor_id));
+
+  ui::CursorLoaderWin cursor_loader;
+  cursor_loader.SetPlatformCursor(&native_cursor);
+  ::SetCursor(native_cursor.platform());
 }
 
 void RootWindowHostWin::SetCapture() {
   if (!has_capture_) {
     has_capture_ = true;
     ::SetCapture(hwnd());
   }
 }
 
 void RootWindowHostWin::ReleaseCapture() {
@@ skipping 103 matching lines @@
 }
 
 void RootWindowHostWin::OnSize(UINT param, const CSize& size) {
   // Minimizing resizes the window to 0x0 which causes our layout to go all
   // screwy, so we just ignore it.
   if (param != SIZE_MINIMIZED)
     delegate_->OnHostResized(gfx::Size(size.cx, size.cy));
 }
 
 }  // namespace aura