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

ui/base/touch/touch_enabled.cc

+// Copyright 2015 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 "ui/base/touch/touch_enabled.h"
+
+#include "base/command_line.h"
+#include "base/logging.h"
+#include "ui/base/touch/touch_device.h"
+#include "ui/base/ui_base_switches.h"
+#include "ui/events/base_event_utils.h"
+#include "ui/events/event_switches.h"
+
+namespace ui {
+
+namespace {
+
+bool ComputeTouchStatus() {
+  auto command_line = base::CommandLine::ForCurrentProcess();

[sadrul, 2015/11/18 19:59:24]

auto*

[afakhry, 2015/11/18 20:08:53]

Done.

+  const std::string touch_enabled_switch =
+      command_line->HasSwitch(switches::kTouchEvents) ?
+          command_line->GetSwitchValueASCII(switches::kTouchEvents) :
+          switches::kTouchEventsAuto;
+
+  if (touch_enabled_switch.empty() ||
+      touch_enabled_switch == switches::kTouchEventsEnabled) {
+    return true;
+  }
+
+  if (touch_enabled_switch == switches::kTouchEventsAuto)
+    return IsTouchDevicePresent();
+
+  if (touch_enabled_switch != switches::kTouchEventsDisabled)
+    LOG(ERROR) << "Invalid --touch-events option: " << touch_enabled_switch;

[sadrul, 2015/11/18 19:59:24]

Use [D]LOG_IF instead

[afakhry, 2015/11/18 20:08:53]

Done.

+  return false;
+}
+
+}  // namespace
+
+bool AreTouchEventsEnabled() {
+  static bool touch_status = ComputeTouchStatus();
+
+#if defined(OS_CHROMEOS)
+  return GetTouchEventsCrOsMasterSwitch() && touch_status;
+#else
+  return touch_status;
+#endif  // !defined(OS_CHROMEOS)
+}
+
+}  // namespace ui
+