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

chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 namespace chromeos {
 namespace system {
 
 namespace {
 
 InputDeviceSettings* g_instance = nullptr;
 InputDeviceSettings* g_test_instance = nullptr;
@@ skipping 111 matching lines @@
 void InputDeviceSettingsImplOzone::ReapplyMouseSettings() {
   MouseSettings::Apply(current_mouse_settings_, this);
 }
 
 void InputDeviceSettingsImplOzone::SetInternalTouchpadEnabled(bool enabled) {
   input_controller_->SetInternalTouchpadEnabled(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
 
 // static
 InputDeviceSettings* InputDeviceSettings::Get() {
   if (g_test_instance)
     return g_test_instance;
   if (!g_instance)
     g_instance = new InputDeviceSettingsImplOzone;
   return g_instance;
 }
 
 // static
 void InputDeviceSettings::SetSettingsForTesting(
     InputDeviceSettings* test_settings) {
   if (g_test_instance == test_settings)
     return;
   delete g_test_instance;
   g_test_instance = test_settings;
 }
 
 }  // namespace system
 }  // namespace chromeos