Implement cursor changing on Mushrome

ash/wm/mushrome_ash_native_cursor_manager.h

Index: ash/wm/mushrome_ash_native_cursor_manager.h
diff --git a/ash/wm/mushrome_ash_native_cursor_manager.h b/ash/wm/mushrome_ash_native_cursor_manager.h
new file mode 100644
index 0000000000000000000000000000000000000000..aa42db6c242518cc7187bbf78d373b5279f2d74a
--- /dev/null
+++ b/ash/wm/mushrome_ash_native_cursor_manager.h
@@ -0,0 +1,68 @@
+// Copyright 2017 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 ASH_WM_MUSHROME_ASH_NATIVE_CURSOR_MANAGER_H_
+#define ASH_WM_MUSHROME_ASH_NATIVE_CURSOR_MANAGER_H_
+
+#include "ash/wm/ash_native_cursor_manager.h"
+
+namespace ui {
+class CursorDataFactoryOzone;
+class ImageCursors;
+}
+
+namespace ash {
+
+// An AshNativeCursorManager which is used in Mushrome mode.
+//
+// ClassicAshNativeCursorManager implicitly communicates with ozone via
+// ImageCursors and the window tree host, but in mushrome, we want to
+// communicate with the window server purely through the mus interfaces.
+//
+// This doesn't mean that we can just cut out all ozone communication; we'll
+// have to do what the mash does, which is install just the cursor factory part
+// of ozone.
+class ASH_EXPORT MushromeAshNativeCursorManager
+    : public AshNativeCursorManager {
+ public:
+  MushromeAshNativeCursorManager();
+  ~MushromeAshNativeCursorManager() override;
+
+ private:
+  // Overridden from AshNativeCursorManager:
+  void SetNativeCursorEnabled(bool enabled) override;
+  float GetScale() const override;
+  display::Display::Rotation GetRotation() const override;
+
+  // Overridden from ::wm::NativeCursorManager:
+  void SetDisplay(const display::Display& display,
+                  ::wm::NativeCursorManagerDelegate* delegate) override;
+  void SetCursor(gfx::NativeCursor cursor,
+                 ::wm::NativeCursorManagerDelegate* delegate) override;
+  void SetVisibility(bool visible,
+                     ::wm::NativeCursorManagerDelegate* delegate) override;
+  void SetCursorSet(ui::CursorSetType cursor_set,
+                    ::wm::NativeCursorManagerDelegate* delegate) override;
+  void SetMouseEventsEnabled(
+      bool enabled,
+      ::wm::NativeCursorManagerDelegate* delegate) override;
+
+  // The cursor location where the cursor was disabled.
+  gfx::Point disabled_cursor_location_;
+
+  bool native_cursor_enabled_;

[James Cook, 2017/06/12 20:17:24]

Is this initialized?

[Elliot Glaysher, 2017/06/12 23:18:46]

Done.

+
+#if defined(USE_OZONE)
+  std::unique_ptr<ui::CursorDataFactoryOzone> cursor_factory_ozone_;
+#endif
+
+  // Always nullptr when USE_OZONE is false.
+  std::unique_ptr<::ui::ImageCursors> image_cursors_;
+
+  DISALLOW_COPY_AND_ASSIGN(MushromeAshNativeCursorManager);
+};
+
+}  // namespace ash
+
+#endif  // ASH_WM_MUSHROME_ASH_NATIVE_CURSOR_MANAGER_H_