Commit aed353b6 authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

UserInputMonitorLinux: don't set for ozone

Atm, this class is X11 only. We need to make that work with
Ozone/X11/Wayland in the future.

Bug: 1085700
Change-Id: I69d7d7128c3fb4b18cbfd8890dc4a1c8e85b1ddd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352928
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798617}
parent 9521ec17
...@@ -20,6 +20,7 @@ include_rules = [ ...@@ -20,6 +20,7 @@ include_rules = [
"+third_party/libyuv", "+third_party/libyuv",
"+third_party/opus", "+third_party/opus",
"+third_party/skia", "+third_party/skia",
"+ui/base/ui_base_features.h",
"+ui/display", "+ui/display",
"+ui/events", "+ui/events",
"+ui/gfx", "+ui/gfx",
......
...@@ -383,6 +383,7 @@ source_set("base") { ...@@ -383,6 +383,7 @@ source_set("base") {
if (use_x11) { if (use_x11) {
sources += [ "user_input_monitor_linux.cc" ] sources += [ "user_input_monitor_linux.cc" ]
deps += [ deps += [
"//ui/base:features",
"//ui/events:events_base", "//ui/events:events_base",
"//ui/events/devices/x11", "//ui/events/devices/x11",
"//ui/gfx/x", "//ui/gfx/x",
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "base/task/current_thread.h" #include "base/task/current_thread.h"
#include "media/base/keyboard_event_counter.h" #include "media/base/keyboard_event_counter.h"
#include "third_party/skia/include/core/SkPoint.h" #include "third_party/skia/include/core/SkPoint.h"
#include "ui/base/ui_base_features.h"
#include "ui/events/devices/x11/xinput_util.h" #include "ui/events/devices/x11/xinput_util.h"
#include "ui/events/keycodes/keyboard_code_conversion_x.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include "ui/gfx/x/x11.h" #include "ui/gfx/x/x11.h"
...@@ -139,6 +140,14 @@ uint32_t UserInputMonitorLinuxCore::GetKeyPressCount() const { ...@@ -139,6 +140,14 @@ uint32_t UserInputMonitorLinuxCore::GetKeyPressCount() const {
void UserInputMonitorLinuxCore::StartMonitor() { void UserInputMonitorLinuxCore::StartMonitor() {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(io_task_runner_->BelongsToCurrentThread());
// TODO(https://crbug.com/1116414): support UserInputMonitorLinux on
// Ozone/Linux.
if (features::IsUsingOzonePlatform()) {
NOTIMPLEMENTED_LOG_ONCE();
StopMonitor();
return;
}
if (!connection_) { if (!connection_) {
// TODO(jamiewalch): We should pass the connection in. // TODO(jamiewalch): We should pass the connection in.
if (auto* connection = x11::Connection::Get()) { if (auto* connection = x11::Connection::Get()) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment