aura-x11: Add custom web cursor support.

ui/aura/root_window_host_win.cc

Index: ui/aura/root_window_host_win.cc
diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/root_window_host_win.cc
index 2e90ba4453234d23fd087ab3345ed5299925af4e..a5176fc37c2981bc38e0a76aaceb65468aa6a62c 100644
--- a/ui/aura/root_window_host_win.cc
+++ b/ui/aura/root_window_host_win.cc
@@ -9,9 +9,9 @@
 #include <algorithm>
 
 #include "base/message_loop.h"
-#include "ui/aura/root_window.h"
 #include "ui/aura/env.h"
 #include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
 
 using std::max;
 using std::min;
@@ -21,75 +21,75 @@ namespace aura {
 namespace {
 
 const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) {
-  switch (native_cursor) {
-    case kCursorNull:
+  switch (native_cursor.native_type()) {
+    case ui::kCursorNull:
       return IDC_ARROW;
-    case kCursorPointer:
+    case ui::kCursorPointer:
       return IDC_ARROW;
-    case kCursorCross:
+    case ui::kCursorCross:
       return IDC_CROSS;
-    case kCursorHand:
+    case ui::kCursorHand:
       return IDC_HAND;
-    case kCursorIBeam:
+    case ui::kCursorIBeam:
       return IDC_IBEAM;
-    case kCursorWait:
+    case ui::kCursorWait:
       return IDC_WAIT;
-    case kCursorHelp:
+    case ui::kCursorHelp:
       return IDC_HELP;
-    case kCursorEastResize:
+    case ui::kCursorEastResize:
       return IDC_SIZEWE;
-    case kCursorNorthResize:
+    case ui::kCursorNorthResize:
       return IDC_SIZENS;
-    case kCursorNorthEastResize:
+    case ui::kCursorNorthEastResize:
       return IDC_SIZENESW;
-    case kCursorNorthWestResize:
+    case ui::kCursorNorthWestResize:
       return IDC_SIZENWSE;
-    case kCursorSouthResize:
+    case ui::kCursorSouthResize:
       return IDC_SIZENS;
-    case kCursorSouthEastResize:
+    case ui::kCursorSouthEastResize:
       return IDC_SIZENWSE;
-    case kCursorSouthWestResize:
+    case ui::kCursorSouthWestResize:
       return IDC_SIZENESW;
-    case kCursorWestResize:
+    case ui::kCursorWestResize:
       return IDC_SIZEWE;
-    case kCursorNorthSouthResize:
+    case ui::kCursorNorthSouthResize:
       return IDC_SIZENS;
-    case kCursorEastWestResize:
+    case ui::kCursorEastWestResize:
       return IDC_SIZEWE;
-    case kCursorNorthEastSouthWestResize:
+    case ui::kCursorNorthEastSouthWestResize:
       return IDC_SIZENESW;
-    case kCursorNorthWestSouthEastResize:
+    case ui::kCursorNorthWestSouthEastResize:
       return IDC_SIZENWSE;
-    case kCursorMove:
+    case ui::kCursorMove:
       return IDC_SIZEALL;
-    case kCursorProgress:
+    case ui::kCursorProgress:
       return IDC_APPSTARTING;
-    case kCursorNoDrop:
+    case ui::kCursorNoDrop:
       return IDC_NO;
-    case kCursorNotAllowed:
+    case ui::kCursorNotAllowed:
       return IDC_NO;
-    case kCursorColumnResize:
-    case kCursorRowResize:
-    case kCursorMiddlePanning:
-    case kCursorEastPanning:
-    case kCursorNorthPanning:
-    case kCursorNorthEastPanning:
-    case kCursorNorthWestPanning:
-    case kCursorSouthPanning:
-    case kCursorSouthEastPanning:
-    case kCursorSouthWestPanning:
-    case kCursorWestPanning:
-    case kCursorVerticalText:
-    case kCursorCell:
-    case kCursorContextMenu:
-    case kCursorAlias:
-    case kCursorCopy:
-    case kCursorNone:
-    case kCursorZoomIn:
-    case kCursorZoomOut:
-    case kCursorGrab:
-    case kCursorGrabbing:
-    case kCursorCustom:
+    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();
@@ -211,7 +211,7 @@ gfx::Point RootWindowHostWin::GetLocationOnNativeScreen() const {
 
 void RootWindowHostWin::SetCursor(gfx::NativeCursor native_cursor) {
   // Custom web cursors are handled directly.
-  if (native_cursor == kCursorCustom)
+  if (native_cursor == ui::kCursorCustom)
     return;
   const wchar_t* cursor_id = GetCursorId(native_cursor);
   // TODO(jamescook): Support for non-system cursors will require finding