Fix a regression in checking the status of the touch events.

chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

Index: chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
index 3a3d98e773d675fb3b505bb32081181cd55df44f..b32f5f08c6a427041451a58726fd6ca606af8cfa 100644
--- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
+++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 
 #include "content/public/browser/browser_thread.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/ozone/public/input_controller.h"
 #include "ui/ozone/public/ozone_platform.h"
 
@@ -136,6 +137,7 @@ void InputDeviceSettingsImplOzone::SetInternalTouchpadEnabled(bool enabled) {
 
 void InputDeviceSettingsImplOzone::SetTouchscreensEnabled(bool enabled) {
   input_controller_->SetTouchscreensEnabled(enabled);
+  ui::SetTouchEventsCrOsMasterSwitch(enabled);

[oshima, 2015/11/18 22:49:41]

I think it's better for the input controller to set this so that there is a
single place that manages the state in ozone.

 }
 
 }  // namespace