chrome/browser/chromeos/system/input_device_settings_impl_x11.cc - Issue 1453813003: Fix a regression in checking the status of the touch events.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Use the master switch on ozone as well. 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

« chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc ('K') | « chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc ('k') | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | ui/base/touch/touch_enabled.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..fb5393c3e7db277b60db21c3968e12dc2ecf97d8 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::SetTouchEventsCrOsMasterSwitch(enabled);

oshima 2015/11/18 22:49:41 It's also be more consistent if we can do somethin

}

void InputDeviceSettingsImplX11::GenerateTouchpadArguments(