OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 case PP_INPUTEVENT_TYPE_MOUSEUP: | 199 case PP_INPUTEVENT_TYPE_MOUSEUP: |
200 pih->HandleMouseButtonEvent(false, event.u.mouse); | 200 pih->HandleMouseButtonEvent(false, event.u.mouse); |
201 return true; | 201 return true; |
202 | 202 |
203 case PP_INPUTEVENT_TYPE_MOUSEMOVE: | 203 case PP_INPUTEVENT_TYPE_MOUSEMOVE: |
204 case PP_INPUTEVENT_TYPE_MOUSEENTER: | 204 case PP_INPUTEVENT_TYPE_MOUSEENTER: |
205 case PP_INPUTEVENT_TYPE_MOUSELEAVE: | 205 case PP_INPUTEVENT_TYPE_MOUSELEAVE: |
206 pih->HandleMouseMoveEvent(event.u.mouse); | 206 pih->HandleMouseMoveEvent(event.u.mouse); |
207 return true; | 207 return true; |
208 | 208 |
| 209 case PP_INPUTEVENT_TYPE_MOUSEWHEEL: |
| 210 pih->HandleMouseWheelEvent(event.u.wheel); |
| 211 return true; |
| 212 |
209 case PP_INPUTEVENT_TYPE_CONTEXTMENU: | 213 case PP_INPUTEVENT_TYPE_CONTEXTMENU: |
210 // We need to return true here or else we'll get a local (plugin) context | 214 // We need to return true here or else we'll get a local (plugin) context |
211 // menu instead of the mouseup event for the right click. | 215 // menu instead of the mouseup event for the right click. |
212 return true; | 216 return true; |
213 | 217 |
214 case PP_INPUTEVENT_TYPE_KEYDOWN: | 218 case PP_INPUTEVENT_TYPE_KEYDOWN: |
215 case PP_INPUTEVENT_TYPE_KEYUP: | 219 case PP_INPUTEVENT_TYPE_KEYUP: |
216 VLOG(3) << "PP_INPUTEVENT_TYPE_KEY" | 220 VLOG(3) << "PP_INPUTEVENT_TYPE_KEY" |
217 << (event.type==PP_INPUTEVENT_TYPE_KEYDOWN ? "DOWN" : "UP") | 221 << (event.type==PP_INPUTEVENT_TYPE_KEYDOWN ? "DOWN" : "UP") |
218 << " key=" << event.u.key.key_code; | 222 << " key=" << event.u.key.key_code; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 object->Init(); | 275 object->Init(); |
272 | 276 |
273 // The pp::Var takes ownership of object here. | 277 // The pp::Var takes ownership of object here. |
274 instance_object_ = pp::Var(this, object); | 278 instance_object_ = pp::Var(this, object); |
275 } | 279 } |
276 | 280 |
277 return instance_object_; | 281 return instance_object_; |
278 } | 282 } |
279 | 283 |
280 } // namespace remoting | 284 } // namespace remoting |
OLD | NEW |