summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remoting/client/plugin/chromoting_instance.cc2
-rw-r--r--remoting/client/plugin/chromoting_instance.h2
-rw-r--r--remoting/client/plugin/pepper_input_handler.cc3
3 files changed, 4 insertions, 3 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 0c63c49..14fad8e 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -112,7 +112,7 @@ bool ChromotingInstance::CurrentlyOnPluginThread() const {
return pepper_main_loop_dont_post_to_me_ == MessageLoop::current();
}
-bool ChromotingInstance::HandleEvent(const PP_InputEvent& event) {
+bool ChromotingInstance::HandleInputEvent(const PP_InputEvent& event) {
DCHECK(CurrentlyOnPluginThread());
PepperInputHandler* pih
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 9001838..ee9b1df 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -50,7 +50,7 @@ class ChromotingInstance : public pp::Instance {
virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
virtual void Connect(const ClientConfig& config);
- virtual bool HandleEvent(const PP_InputEvent& event);
+ virtual bool HandleInputEvent(const PP_InputEvent& event);
virtual pp::Var GetInstanceObject();
virtual void ViewChanged(const pp::Rect& position, const pp::Rect& clip);
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc
index c5677bd..c2e2099 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -25,7 +25,8 @@ void PepperInputHandler::HandleKeyEvent(bool keydown,
SendKeyEvent(keydown, event.key_code);
}
-void PepperInputHandler::HandleCharacterEvent(const PP_InputEvent_Character& event) {
+void PepperInputHandler::HandleCharacterEvent(
+ const PP_InputEvent_Character& event) {
// TODO(garykac): Coordinate key and char events.
}