OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bind.h" | 10 #include "base/bind.h" |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 return true; | 251 return true; |
252 } | 252 } |
253 | 253 |
254 case PP_INPUTEVENT_TYPE_MOUSEMOVE: | 254 case PP_INPUTEVENT_TYPE_MOUSEMOVE: |
255 case PP_INPUTEVENT_TYPE_MOUSEENTER: | 255 case PP_INPUTEVENT_TYPE_MOUSEENTER: |
256 case PP_INPUTEVENT_TYPE_MOUSELEAVE: { | 256 case PP_INPUTEVENT_TYPE_MOUSELEAVE: { |
257 pih->HandleMouseMoveEvent(pp::MouseInputEvent(event)); | 257 pih->HandleMouseMoveEvent(pp::MouseInputEvent(event)); |
258 return true; | 258 return true; |
259 } | 259 } |
260 | 260 |
| 261 case PP_INPUTEVENT_TYPE_WHEEL: { |
| 262 pih->HandleMouseWheelEvent(pp::WheelInputEvent(event)); |
| 263 return true; |
| 264 } |
| 265 |
261 case PP_INPUTEVENT_TYPE_CONTEXTMENU: { | 266 case PP_INPUTEVENT_TYPE_CONTEXTMENU: { |
262 // We need to return true here or else we'll get a local (plugin) context | 267 // We need to return true here or else we'll get a local (plugin) context |
263 // menu instead of the mouseup event for the right click. | 268 // menu instead of the mouseup event for the right click. |
264 return true; | 269 return true; |
265 } | 270 } |
266 | 271 |
267 case PP_INPUTEVENT_TYPE_KEYDOWN: { | 272 case PP_INPUTEVENT_TYPE_KEYDOWN: { |
268 pp::KeyboardInputEvent key = pp::KeyboardInputEvent(event); | 273 pp::KeyboardInputEvent key = pp::KeyboardInputEvent(event); |
269 VLOG(3) << "PP_INPUTEVENT_TYPE_KEYDOWN" << " key=" << key.GetKeyCode(); | 274 VLOG(3) << "PP_INPUTEVENT_TYPE_KEYDOWN" << " key=" << key.GetKeyCode(); |
270 pih->HandleKeyEvent(true, key); | 275 pih->HandleKeyEvent(true, key); |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 initial_policy_received_ = true; | 524 initial_policy_received_ = true; |
520 enable_client_nat_traversal_ = traversal_policy; | 525 enable_client_nat_traversal_ = traversal_policy; |
521 | 526 |
522 if (!delayed_connect_.is_null()) { | 527 if (!delayed_connect_.is_null()) { |
523 thread_proxy_->PostTask(FROM_HERE, delayed_connect_); | 528 thread_proxy_->PostTask(FROM_HERE, delayed_connect_); |
524 delayed_connect_.Reset(); | 529 delayed_connect_.Reset(); |
525 } | 530 } |
526 } | 531 } |
527 | 532 |
528 } // namespace remoting | 533 } // namespace remoting |
OLD | NEW |