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

services/ui/ws/platform_display_default.h

 // Copyright 2016 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_PLATFORM_DISPLAY_DEFAULT_H_
 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 11 matching lines @@
 class LocatedEvent;
 class PlatformWindow;
 
 namespace ws {
 
 // PlatformDisplay implementation that connects to a PlatformWindow and
 // FrameGenerator for Chrome OS.
 class PlatformDisplayDefault : public PlatformDisplay,
                                public ui::PlatformWindowDelegate {
  public:
+  // |image_cursors| may be null, for example on Android or in tests.
   PlatformDisplayDefault(ServerWindow* root_window,
-                         const display::ViewportMetrics& metrics);
+                         const display::ViewportMetrics& metrics,
+                         std::unique_ptr<ImageCursors> image_cursors);
   ~PlatformDisplayDefault() override;
 
   // EventSource::
   EventSink* GetEventSink() override;
 
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
@@ skipping 21 matching lines @@
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_scale_factor) override;
   void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
   ServerWindow* root_window_;
 
-#if !defined(OS_ANDROID)

[James Cook, 2017/03/31 23:31:20]

Lemme know if you want me to keep these ifdefs. I think ImageCursors is compiled
on Android, so leaving it null seemed a little better than keeping it ifdef-y.

   std::unique_ptr<ui::ImageCursors> image_cursors_;
-#endif
 
   PlatformDisplayDelegate* delegate_ = nullptr;
   std::unique_ptr<FrameGenerator> frame_generator_;
 
   display::ViewportMetrics metrics_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
   gfx::AcceleratedWidget widget_;
 
   DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_