Upstream version 10.38.208.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / system / input_device_settings.cc

diff --git a/src/chrome/browser/chromeos/system/input_device_settings.cc b/src/chrome/browser/chromeos/system/input_device_settings.cc
index e92b31a..56f9fe6 100644 (file)
--- a/src/chrome/browser/chromeos/system/input_device_settings.cc
+++ b/src/chrome/browser/chromeos/system/input_device_settings.cc
@@ -37,8 +37,6 @@ const char kDeviceTypeTouchpad[] = "touchpad";
 const char kDeviceTypeMouse[] = "mouse";
 const char kInputControl[] = "/opt/google/input/inputcontrol";
 
-const char kRemoraRequisition[] = "remora";
-
 typedef base::RefCountedData<bool> RefCountedBool;
 
 bool ScriptExists(const std::string& script) {
@@ -247,8 +245,8 @@ bool InputDeviceSettingsImpl::ForceKeyboardDrivenUINavigation() {
   if (!policy_manager)
     return false;
 
-  if (base::strcasecmp(policy_manager->GetDeviceRequisition().c_str(),
-                       kRemoraRequisition) == 0) {
+  if (policy_manager->IsRemoraRequisition() ||
+      policy_manager->IsSharkRequisition()) {
     return true;
   }
 
@@ -355,7 +353,10 @@ bool TouchpadSettings::Update(const TouchpadSettings& settings,
     if (argv)
       AddTPControlArguments("tapdrag", tap_dragging_.value(), argv);
   }
-  if (natural_scroll_.Update(settings.natural_scroll_)) {
+  natural_scroll_.Update(settings.natural_scroll_);
+  // Always send natural scrolling to the shell command, as a workaround.
+  // See crbug.com/406480
+  if (natural_scroll_.is_set()) {
     updated = true;
     if (argv)
       AddTPControlArguments("australian_scrolling", natural_scroll_.value(),