[views-mus] Support custom cursors.

services/ui/ws/server_window_observer.h

 // Copyright 2015 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 SERVICES_UI_WS_SERVER_WINDOW_OBSERVER_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_OBSERVER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 48 matching lines @@
   virtual void OnWindowReordered(ServerWindow* window,
                                  ServerWindow* relative,
                                  mojom::OrderDirection direction) {}
 
   virtual void OnWillChangeWindowVisibility(ServerWindow* window) {}
   virtual void OnWindowVisibilityChanged(ServerWindow* window) {}
   virtual void OnWindowOpacityChanged(ServerWindow* window,
                                       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) {}
 
   virtual void OnWindowSharedPropertyChanged(
       ServerWindow* window,
       const std::string& name,
       const std::vector<uint8_t>* new_data) {}
 
   // Called when the window is no longer an embed root.
   virtual void OnWindowEmbeddedAppDisconnected(ServerWindow* window) {}
 
   // Called when a transient child is added to |window|.
   virtual void OnTransientWindowAdded(ServerWindow* window,
                                       ServerWindow* transient_child) {}
 
   // Called when a transient child is removed from |window|.
   virtual void OnTransientWindowRemoved(ServerWindow* window,
                                         ServerWindow* transient_child) {}
 
  protected:
   virtual ~ServerWindowObserver() {}
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_OBSERVER_H_