diff options
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/client/plugin/DEPS | 3 | ||||
-rw-r--r-- | remoting/client/plugin/pepper_input_handler.cc | 13 | ||||
-rw-r--r-- | remoting/protocol/DEPS | 1 | ||||
-rw-r--r-- | remoting/protocol/key_event_tracker.cc | 22 |
4 files changed, 1 insertions, 38 deletions
diff --git a/remoting/client/plugin/DEPS b/remoting/client/plugin/DEPS deleted file mode 100644 index db883e4..0000000 --- a/remoting/client/plugin/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+ui/base/keycodes", -] diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc index 3bf006c..e555f06 100644 --- a/remoting/client/plugin/pepper_input_handler.cc +++ b/remoting/client/plugin/pepper_input_handler.cc @@ -4,13 +4,10 @@ #include "remoting/client/plugin/pepper_input_handler.h" -#include <iomanip> - #include "base/logging.h" #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/point.h" #include "remoting/proto/event.pb.h" -#include "ui/base/keycodes/keyboard_codes.h" namespace remoting { @@ -34,18 +31,8 @@ bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) { case PP_INPUTEVENT_TYPE_KEYUP: { pp::KeyboardInputEvent pp_key_event(event); protocol::KeyEvent key_event; - key_event.set_keycode(pp_key_event.GetKeyCode()); key_event.set_pressed(event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN); - - // Dump the modifiers associated with each ESC key release event - // to facilitate debugging of issues caused by mixed up modifiers. - if ((pp_key_event.GetKeyCode() == ui::VKEY_ESCAPE) && - (event.GetType() == PP_INPUTEVENT_TYPE_KEYUP)) { - LOG(INFO) << "ESC released: modifiers=0x" - << std::hex << pp_key_event.GetModifiers() << std::dec; - } - input_stub_->InjectKeyEvent(key_event); return true; } diff --git a/remoting/protocol/DEPS b/remoting/protocol/DEPS index d1aa4ddb..c982f42 100644 --- a/remoting/protocol/DEPS +++ b/remoting/protocol/DEPS @@ -7,5 +7,4 @@ include_rules = [ "+ppapi/utility", "+remoting/jingle_glue", "+third_party/protobuf/src", - "+ui/base/keycodes", ] diff --git a/remoting/protocol/key_event_tracker.cc b/remoting/protocol/key_event_tracker.cc index d3ba9b5..a2aa836 100644 --- a/remoting/protocol/key_event_tracker.cc +++ b/remoting/protocol/key_event_tracker.cc @@ -1,14 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "remoting/protocol/key_event_tracker.h" -#include <sstream> - #include "base/logging.h" #include "remoting/proto/event.pb.h" -#include "ui/base/keycodes/keyboard_codes.h" namespace remoting { namespace protocol { @@ -28,23 +25,6 @@ void KeyEventTracker::InjectKeyEvent(const KeyEvent& event) { pressed_keys_.insert(event.keycode()); } else { pressed_keys_.erase(event.keycode()); - - // Dump the list of currently pressed keys every time ESC is released - // to facilitate debugging of lost key events issues. - if (event.keycode() == ui::VKEY_ESCAPE) { - std::ostringstream keys; - std::set<int>::const_iterator i = pressed_keys_.begin(); - if (i == pressed_keys_.end()) { - keys << "<none>"; - } else { - keys << *i++; - for (; i != pressed_keys_.end(); ++i) { - keys << ", " << *i; - } - } - - LOG(INFO) << "ESC released: pressed keys=" << keys.str(); - } } input_stub_->InjectKeyEvent(event); } |