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

Unified Diff: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into flags1 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
index 3800b973a166f222d7a8bf01ca346333cd0741f0..a8b24e90fd8a0d7e91c4ee4dc571ae37b4672793 100644
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -260,17 +260,13 @@ void RecordTouchEventState() {
const std::string touch_enabled_switch =
command_line.HasSwitch(switches::kTouchEvents) ?
command_line.GetSwitchValueASCII(switches::kTouchEvents) :
- switches::kTouchEventsAuto;
+ switches::kTouchEventsEnabled;
UMATouchEventsState state;
if (touch_enabled_switch.empty() ||
- touch_enabled_switch == switches::kTouchEventsEnabled) {
+ touch_enabled_switch == switches::kTouchEventsEnabled ||
+ touch_enabled_switch == switches::kTouchEventsAuto) {
state = UMA_TOUCH_EVENTS_ENABLED;
- } else if (touch_enabled_switch == switches::kTouchEventsAuto) {
- state = (ui::GetTouchScreensAvailability() ==
- ui::TouchScreensAvailability::ENABLED)
- ? UMA_TOUCH_EVENTS_AUTO_ENABLED
- : UMA_TOUCH_EVENTS_AUTO_DISABLED;
} else if (touch_enabled_switch == switches::kTouchEventsDisabled) {
state = UMA_TOUCH_EVENTS_DISABLED;
} else {
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/renderer_host/legacy_render_widget_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698