Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(851)

Unified Diff: ui/base/touch/touch_enabled.cc

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Deprecate the histogram. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/touch/touch_enabled.cc
diff --git a/ui/base/touch/touch_enabled.cc b/ui/base/touch/touch_enabled.cc
deleted file mode 100644
index 4992f2ff627240df11f05657f6d53968f0871572..0000000000000000000000000000000000000000
--- a/ui/base/touch/touch_enabled.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// 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 {
-
-enum class TouchEventsStatus {
- AUTO,
- DISABLED,
- ENABLED,
-};
-
-TouchEventsStatus ComputeTouchFlagStatus() {
- auto* command_line = base::CommandLine::ForCurrentProcess();
- 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 TouchEventsStatus::ENABLED;
- }
-
- if (touch_enabled_switch == switches::kTouchEventsAuto)
- return TouchEventsStatus::AUTO;
-
- DLOG_IF(ERROR, touch_enabled_switch != switches::kTouchEventsDisabled) <<
- "Invalid --touch-events option: " << touch_enabled_switch;
- return TouchEventsStatus::DISABLED;
-}
-
-} // namespace
-
-bool AreTouchEventsEnabled() {
- static TouchEventsStatus touch_flag_status = ComputeTouchFlagStatus();
-
- // The #touch-events flag is used to force and simulate the presence or
- // absence of touch devices. Only if the flag is set to AUTO, we need to check
- // for the actual availability of touch devices.
- if (touch_flag_status == TouchEventsStatus::AUTO)
- return GetTouchScreensAvailability() == TouchScreensAvailability::ENABLED;
-
- return touch_flag_status == TouchEventsStatus::ENABLED;
-}
-
-} // namespace ui
-

Powered by Google App Engine
This is Rietveld 408576698