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

Unified Diff: chrome/browser/chromeos/system/input_device_settings_impl_x11.cc

Issue 1453813003: Fix a regression in checking the status of the touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dtapuska's comments Created 5 years, 1 month 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: chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc b/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
index 21674039392c06f2bad61b8e7553901b77e289b3..c809fa1cfa8b6165005ab12a21292fa27ba7d529 100644
--- a/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
+++ b/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
@@ -294,7 +294,7 @@ void InputDeviceSettingsImplX11::SetInternalTouchpadEnabled(bool enabled) {
}
void InputDeviceSettingsImplX11::SetTouchscreensEnabled(bool enabled) {
- ui::SetTouchEventsEnabled(enabled);
+ ui::SetTouchEventsCrOsX11MasterSwitch(enabled);
}
void InputDeviceSettingsImplX11::GenerateTouchpadArguments(
« no previous file with comments | « no previous file | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | ui/base/touch/touch_enabled.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698