summaryrefslogtreecommitdiffstats
path: root/remoting/client
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 22:04:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 22:04:32 +0000
commitd912c698831fee8a5dd35ec603c2127663f593ed (patch)
tree2652decd8a67ee8dfe1b409006665ad21cdd0919 /remoting/client
parent45cce16952513f09dc045533d16e0135094fc3e3 (diff)
downloadchromium_src-d912c698831fee8a5dd35ec603c2127663f593ed.zip
chromium_src-d912c698831fee8a5dd35ec603c2127663f593ed.tar.gz
chromium_src-d912c698831fee8a5dd35ec603c2127663f593ed.tar.bz2
Convert input event to interface version 1.0. Rename some of the mouse and
wheel events to remove the redundant "Mouse" and "Wheel" in the getters. Rename PP_INPUTEVENT_TYPE_MOUSEWHEEL to .._WHEEL so that it doesn't look like a mouse event (it's its own type). Add documentation to the C++ wrapper from the C wrappers. Do some minor documentation updates. Update IDL for some of the recent changes we've made. Update the way points are passed for resource creation since IDL wanted to do it by pointer. TEST=it compiles. Review URL: http://codereview.chromium.org/7464003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
-rw-r--r--remoting/client/plugin/pepper_input_handler.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc
index f94a402..01fd250 100644
--- a/remoting/client/plugin/pepper_input_handler.cc
+++ b/remoting/client/plugin/pepper_input_handler.cc
@@ -39,8 +39,8 @@ void PepperInputHandler::HandleCharacterEvent(const KeyboardInputEvent& event) {
}
void PepperInputHandler::HandleMouseMoveEvent(const MouseInputEvent& event) {
- gfx::Point p(static_cast<int>(event.GetMousePosition().x()),
- static_cast<int>(event.GetMousePosition().y()));
+ gfx::Point p(static_cast<int>(event.GetPosition().x()),
+ static_cast<int>(event.GetPosition().y()));
// Pepper gives co-ordinates in the plugin instance's co-ordinate system,
// which may be different from the host desktop's co-ordinate system.
p = view_->ConvertScreenToHost(p);
@@ -50,11 +50,11 @@ void PepperInputHandler::HandleMouseMoveEvent(const MouseInputEvent& event) {
void PepperInputHandler::HandleMouseButtonEvent(bool button_down,
const MouseInputEvent& event) {
MouseEvent::MouseButton button = MouseEvent::BUTTON_UNDEFINED;
- if (event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) {
+ if (event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_LEFT) {
button = MouseEvent::BUTTON_LEFT;
- } else if (event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_MIDDLE) {
+ } else if (event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_MIDDLE) {
button = MouseEvent::BUTTON_MIDDLE;
- } else if (event.GetMouseButton() == PP_INPUTEVENT_MOUSEBUTTON_RIGHT) {
+ } else if (event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_RIGHT) {
button = MouseEvent::BUTTON_RIGHT;
}