Include external touchscreen vid/pid in UMA hardware profile

ui/events/event_utils.cc

 // Copyright (c) 2012 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/events/event_utils.h"
 
 #include <vector>
 
 #include "ui/events/event.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ui {
 
 namespace {
 int g_custom_event_types = ET_LAST;
 }  // namespace
 
 int RegisterCustomEventType() {
   return ++g_custom_event_types;
 }
 
 base::TimeDelta EventTimeForNow() {
   return base::TimeDelta::FromInternalValue(
       base::TimeTicks::Now().ToInternalValue());
 }
 
 bool ShouldDefaultToNaturalScroll() {
+  return InternalDisplaySupportsTouch() == INTERNAL_DISPLAY_HAS_TOUCH_SUPPORT;
+}
+
+InternalDisplayHasTouchSupport InternalDisplaySupportsTouch() {
   gfx::Screen* screen = gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE);
   if (!screen)

[oshima, 2014/01/14 22:35:01]

This should not happen. I was thinking to change screen to return empty list and
use it as the indicator, but as I mentioned above, I'll make CL so that it will
return the last display info during the shutdown.

-    return false;
+    return INTERNAL_DISPLAY_UNKNOWN_TOUCH_SUPPORT;
   const std::vector<gfx::Display>& displays = screen->GetAllDisplays();
   for (std::vector<gfx::Display>::const_iterator it = displays.begin();
        it != displays.end(); ++it) {
     const gfx::Display& display = *it;
     if (display.IsInternal() &&
         display.touch_support() == gfx::Display::TOUCH_SUPPORT_AVAILABLE)

[oshima, 2014/01/14 22:35:01]

you also need to check if it's UNKNOWN or not.

[tdresser, 2014/01/17 20:38:35]

Done.

-      return true;
+      return INTERNAL_DISPLAY_HAS_TOUCH_SUPPORT;
   }
-  return false;
+  return INTERNAL_DISPLAY_NO_TOUCH_SUPPORT;
 }
 
 }  // namespace ui