Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(413)

Unified Diff: remoting/protocol/input_event_tracker.cc

Issue 10894050: Remove support for Windows-style keycodes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Linux EventExecutor typo. Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/input_event_tracker.h ('k') | remoting/protocol/input_event_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/input_event_tracker.cc
diff --git a/remoting/protocol/input_event_tracker.cc b/remoting/protocol/input_event_tracker.cc
index 3fb0cf463f8f418e605f2fba8c28c98eef242023..ab9e585205e3feac801efe9a47e381a4b98b4b4d 100644
--- a/remoting/protocol/input_event_tracker.cc
+++ b/remoting/protocol/input_event_tracker.cc
@@ -24,7 +24,7 @@ bool InputEventTracker::IsKeyPressed(uint32 usb_keycode) const {
}
int InputEventTracker::PressedKeyCount() const {
- return pressed_keys_.size() + pressed_vkeys_.size();
+ return pressed_keys_.size();
}
void InputEventTracker::ReleaseAll() {
@@ -37,15 +37,6 @@ void InputEventTracker::ReleaseAll() {
}
pressed_keys_.clear();
- std::set<int>::iterator j;
- for (j = pressed_vkeys_.begin(); j != pressed_vkeys_.end(); ++j) {
- KeyEvent event;
- event.set_pressed(false);
- event.set_keycode(*j);
- input_stub_->InjectKeyEvent(event);
- }
- pressed_vkeys_.clear();
-
for (int i = MouseEvent::BUTTON_UNDEFINED + 1;
i < MouseEvent::BUTTON_MAX; ++i) {
if (mouse_button_state_ & (1 << (i - 1))) {
@@ -72,12 +63,6 @@ void InputEventTracker::InjectKeyEvent(const KeyEvent& event) {
} else {
pressed_keys_.erase(event.usb_keycode());
}
- } else if (event.has_keycode()) {
- if (event.pressed()) {
- pressed_vkeys_.insert(event.keycode());
- } else {
- pressed_vkeys_.erase(event.keycode());
- }
}
}
input_stub_->InjectKeyEvent(event);
« no previous file with comments | « remoting/protocol/input_event_tracker.h ('k') | remoting/protocol/input_event_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698