| 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 771856086a9782b523294ff2af6ed0b1c0aaf5f8..1d6edf3baade91ef3bb7209b666f503af53d7795 100644
|
| --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
| +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
|
| @@ -258,15 +258,19 @@ void RecordTouchEventState() {
|
| const base::CommandLine& command_line =
|
| *base::CommandLine::ForCurrentProcess();
|
| const std::string touch_enabled_switch =
|
| - command_line.HasSwitch(switches::kTouchEvents) ?
|
| - command_line.GetSwitchValueASCII(switches::kTouchEvents) :
|
| - switches::kTouchEventsEnabled;
|
| + command_line.HasSwitch(switches::kTouchEvents)
|
| + ? command_line.GetSwitchValueASCII(switches::kTouchEvents)
|
| + : switches::kTouchEventsAuto;
|
|
|
| UMATouchEventsState state;
|
| if (touch_enabled_switch.empty() ||
|
| - touch_enabled_switch == switches::kTouchEventsEnabled ||
|
| - touch_enabled_switch == switches::kTouchEventsAuto) {
|
| + touch_enabled_switch == switches::kTouchEventsEnabled) {
|
| 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 {
|
|
|