Index: remoting/client/plugin/pepper_input_handler.h |
diff --git a/remoting/client/plugin/pepper_input_handler.h b/remoting/client/plugin/pepper_input_handler.h |
index bc7f2be34af78095756862d17fd2d10d2d8c871d..e13788ea12d5c7f7bdb5e6710b374054822ec74a 100644 |
--- a/remoting/client/plugin/pepper_input_handler.h |
+++ b/remoting/client/plugin/pepper_input_handler.h |
@@ -5,37 +5,27 @@ |
#ifndef REMOTING_CLIENT_PLUGIN_PEPPER_INPUT_HANDLER_H_ |
#define REMOTING_CLIENT_PLUGIN_PEPPER_INPUT_HANDLER_H_ |
-#include "remoting/client/input_handler.h" |
+#include "remoting/protocol/input_stub.h" |
namespace pp { |
-class KeyboardInputEvent; |
-class MouseInputEvent; |
-class WheelInputEvent; |
+class InputEvent; |
} |
Sergey Ulanov
2011/12/20 00:05:35
// namespace pp
Wez
2011/12/20 07:14:14
Done.
|
namespace remoting { |
-class PepperViewProxy; |
+namespace protocol { |
+class InputStub; |
+} |
Sergey Ulanov
2011/12/20 00:05:35
// namepsace protocol
Wez
2011/12/20 07:14:14
Done.
|
-class PepperInputHandler : public InputHandler { |
+class PepperInputHandler { |
public: |
- PepperInputHandler(ClientContext* context, |
- protocol::ConnectionToHost* connection, |
- PepperViewProxy* view); |
+ PepperInputHandler(protocol::InputStub* input_stub); |
virtual ~PepperInputHandler(); |
- virtual void Initialize() OVERRIDE; |
- |
- void HandleKeyEvent(bool keydown, const pp::KeyboardInputEvent& event); |
- void HandleCharacterEvent(const pp::KeyboardInputEvent& event); |
- |
- void HandleMouseMoveEvent(const pp::MouseInputEvent& event); |
- void HandleMouseButtonEvent(bool button_down, |
- const pp::MouseInputEvent& event); |
- void HandleMouseWheelEvent(const pp::WheelInputEvent& event); |
+ bool HandleInputEvent(const pp::InputEvent& event); |
private: |
- PepperViewProxy* pepper_view_; |
+ protocol::InputStub* input_stub_; |
float wheel_ticks_x_; |
float wheel_ticks_y_; |