mash: Don't synthesize extra key press events in the window server

services/ui/ws/platform_display.cc

 // Copyright 2014 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 "services/ui/ws/platform_display.h"
 
 #include "base/memory/ptr_util.h"
 #include "services/ui/ws/platform_display_default.h"
 #include "services/ui/ws/platform_display_factory.h"
 #include "services/ui/ws/server_window.h"
+#include "ui/base/cursor/image_cursors.h"
 
 namespace ui {
 namespace ws {
 
 // static
 PlatformDisplayFactory* PlatformDisplay::factory_ = nullptr;
 
 // static
 std::unique_ptr<PlatformDisplay> PlatformDisplay::Create(
     ServerWindow* root,
     const display::ViewportMetrics& metrics) {
   if (factory_)
     return factory_->CreatePlatformDisplay(root, metrics);
 
-  return base::MakeUnique<PlatformDisplayDefault>(root, metrics);
+#if defined(OS_ANDROID)
+  return base::MakeUnique<PlatformDisplayDefault>(root, metrics,
+                                                  nullptr /* image_cursors */);
+#else
+  return base::MakeUnique<PlatformDisplayDefault>(
+      root, metrics, base::MakeUnique<ImageCursors>());
+#endif
 }
 
 }  // namespace ws
 }  // namespace ui