Move mus::InputEventHandler implementation and tests from PlatformWindowMus to NativeWidgetMus

ui/views/mus/native_widget_mus.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 UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 #define UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "components/mus/public/cpp/input_event_handler.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_tree_host_observer.h"
 #include "ui/platform_window/platform_window_delegate.h"
 #include "ui/views/mus/mus_export.h"
+#include "ui/views/mus/window_tree_host_mus.h"
 #include "ui/views/widget/native_widget_private.h"
 
 namespace aura {
 namespace client {
 class DefaultCaptureClient;
 class ScreenPositionClient;
 class WindowTreeClient;
 }
 class Window;
 }
 
 namespace mus {
 class Window;
 class WindowTreeConnection;
 namespace mojom {
 enum class Cursor;
+enum class EventResult;
 }
 }
 
 namespace shell {
 class Connector;
 }
 
+namespace ui {
+class Event;
+}
+
 namespace wm {
 class CursorManager;
 class FocusController;
 }
 
 namespace views {
 class SurfaceContextFactory;
 class WidgetDelegate;
-class WindowTreeHostMus;
 
 // An implementation of NativeWidget that binds to a mus::Window. Because Aura
 // is used extensively within Views code, this code uses aura and binds to the
 // mus::Window via a Mus-specific aura::WindowTreeHost impl. Because the root
 // aura::Window in a hierarchy is created without a delegate by the
 // aura::WindowTreeHost, we must create a child aura::Window in this class
 // (content_) and attach it to the root.
-class VIEWS_MUS_EXPORT NativeWidgetMus : public internal::NativeWidgetPrivate,
-                                         public aura::WindowDelegate,
-                                         public aura::WindowTreeHostObserver {
+class VIEWS_MUS_EXPORT NativeWidgetMus
+    : public internal::NativeWidgetPrivate,
+      public aura::WindowDelegate,
+      public aura::WindowTreeHostObserver,
+      public NON_EXPORTED_BASE(mus::InputEventHandler) {
  public:
   NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
                   shell::Connector* connector,
                   mus::Window* window,
                   mus::mojom::SurfaceType surface_type);
   ~NativeWidgetMus() override;
 
   // Configures the set of properties supplied to the window manager when
   // creating a new Window for a Widget.
   static void ConfigurePropertiesForNewWindow(
@@ skipping 128 matching lines @@
 
   // Overridden from ui::EventHandler:
   void OnKeyEvent(ui::KeyEvent* event) override;
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnScrollEvent(ui::ScrollEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from aura::WindowTreeHostObserver:
   void OnHostCloseRequested(const aura::WindowTreeHost* host) override;
 
- private:
+  // Overridden from mus::InputEventHandler:
+  void OnWindowInputEvent(
+      mus::Window* view,
+      const ui::Event& event,
+      std::unique_ptr<base::Callback<void(mus::mojom::EventResult)>>*
+          ack_callback) override;
+
+private:
+  friend class NativeWidgetMusTest;
   class MusWindowObserver;
 
+  ui::PlatformWindowDelegate* platform_window_delegate() {
+    return window_tree_host();
+  }
+
   void set_last_cursor(mus::mojom::Cursor cursor) { last_cursor_ = cursor; }
   void SetShowState(mus::mojom::ShowState show_state);
 
   void OnMusWindowVisibilityChanging(mus::Window* window);
   void OnMusWindowVisibilityChanged(mus::Window* window);
 
   mus::Window* window_;
   mus::mojom::Cursor last_cursor_;
 
   internal::NativeWidgetDelegate* native_widget_delegate_;
@@ skipping 18 matching lines @@
   std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
   std::unique_ptr<wm::CursorManager> cursor_manager_;
   base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_NATIVE_WIDGET_MUS_H_