Clean up input handling in VulkanViewer

tools/vulkan/viewer/VulkanViewer.h

Index: tools/vulkan/viewer/VulkanViewer.h
diff --git a/tools/vulkan/viewer/VulkanViewer.h b/tools/vulkan/viewer/VulkanViewer.h
index 48ab7af80fcdba8c88923adff7716f6e48d79f06..29cbbef16ea08d99c2b08b03d3feefd6fe9179db 100644
--- a/tools/vulkan/viewer/VulkanViewer.h
+++ b/tools/vulkan/viewer/VulkanViewer.h
@@ -9,7 +9,6 @@
 #define VulkanViewer_DEFINED
 
 #include "../Application.h"
-#include "InputHandler.h"
 #include "../Window.h"
 #include "gm.h"
 
@@ -20,15 +19,13 @@ public:
     VulkanViewer(int argc, char** argv, void* platformData);
     ~VulkanViewer() override;
 
-    bool onKey(int key, bool keyDown);
-    bool onMouse(int x, int y, bool mouseDown);
+    bool onKey(Window::Key key, Window::InputState state, uint32_t modifiers);
     void onPaint(SkCanvas* canvas);
 
     void onIdle(float dt) override;
 
 private:
     Window*      fWindow;
-    InputHandler fInputHandler;
 
     const skiagm::GMRegistry* fGMs;
 };