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

chrome/browser/chromeos/system/input_device_settings_impl_x11.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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 276 matching lines @@
         device_data_manager->EnableDevice(xi_dev_list[i].deviceid);
       else
         device_data_manager->DisableDevice(xi_dev_list[i].deviceid);
 
       return;
     }
   }
 }
 
 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 something like

ui::TocuhFactory::GetInstance()->SetTouchscreensEnabled(enabled)

and let the InputFactory sets this flag and update its own flag like ozone case.

 }
 
 void InputDeviceSettingsImplX11::GenerateTouchpadArguments(
     std::vector<std::string>* argv) {
   argv->push_back(kInputControl);
   if (current_touchpad_settings_.IsSensitivitySet()) {
     AddSensitivityArguments(kDeviceTypeTouchpad,
                             current_touchpad_settings_.GetSensitivity(), argv);
   }
   if (current_touchpad_settings_.IsTapToClickSet()) {
@@ skipping 43 matching lines @@
 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