[views-mus] Support custom cursors.

services/ui/ws/server_window_observer.h

Index: services/ui/ws/server_window_observer.h
diff --git a/services/ui/ws/server_window_observer.h b/services/ui/ws/server_window_observer.h
index 265c408b5a4bc3400189fbef94704a6836f41510..df33e10cf6dfcfc80514694cec0e3de0b49eda0a 100644
--- a/services/ui/ws/server_window_observer.h
+++ b/services/ui/ws/server_window_observer.h
@@ -66,10 +66,11 @@ class ServerWindowObserver {
                                       float old_opacity,
                                       float new_opacity) {}
 
-  virtual void OnWindowPredefinedCursorChanged(ServerWindow* window,
-                                               mojom::CursorType cursor_id) {}
+  virtual void OnWindowCursorChanged(ServerWindow* window,
+                                     const ui::CursorData& cursor_id) {}

[sky, 2017/04/26 22:16:16]

cursor_id -> cursor_data ? (same comment for next function).

[Elliot Glaysher, 2017/04/26 23:09:04]

fixed here and elsewhere

   virtual void OnWindowNonClientCursorChanged(ServerWindow* window,
-                                              mojom::CursorType cursor_id) {}
+                                              const ui::CursorData& cursor_id) {
+  }
 
   virtual void OnWindowTextInputStateChanged(ServerWindow* window,
                                              const ui::TextInputState& state) {}