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

Unified Diff: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc

Issue 1003523004: Remove GestureInterpreterLibevdevCros::SetAllowedKeys() because it is a no-op (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
diff --git a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
index a0b84585844f6340b7d284f0c1bc4d7eba186b50..a9709f80b98cecb6edc0b7c362e072a3a7c0f8bb 100644
--- a/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
+++ b/ui/events/ozone/evdev/libgestures_glue/event_reader_libevdev_cros.cc
@@ -37,6 +37,9 @@ EventReaderLibevdevCros::EventReaderLibevdevCros(int fd,
has_touchpad_(devinfo.HasTouchpad()),
has_caps_lock_led_(devinfo.HasLedEvent(LED_CAPSL)),
delegate_(delegate.Pass()) {
+ // This class assumes it does not deal with internal keyboards.
+ CHECK(!has_keyboard_ || type != INPUT_DEVICE_INTERNAL);
spang 2015/03/11 21:12:26 DCHECK per the style guide.
+
memset(&evdev_, 0, sizeof(evdev_));
evdev_.log = OnLogMessage;
evdev_.log_udata = this;
@@ -87,17 +90,6 @@ bool EventReaderLibevdevCros::HasCapsLockLed() const {
return has_caps_lock_led_;
}
-void EventReaderLibevdevCros::SetAllowedKeys(
- scoped_ptr<std::set<DomCode>> allowed_keys) {
- DCHECK(HasKeyboard());
- delegate_->SetAllowedKeys(allowed_keys.Pass());
-}
-
-void EventReaderLibevdevCros::AllowAllKeys() {
- DCHECK(HasKeyboard());
- delegate_->AllowAllKeys();
-}
-
void EventReaderLibevdevCros::OnStopped() {
delegate_->OnLibEvdevCrosStopped(&evdev_, &evstate_);
}

Powered by Google App Engine
This is Rietveld 408576698