PlatformScreenOzone using DisplayManager

services/ui/display/viewport_metrics.cc

Index: services/ui/display/viewport_metrics.cc
diff --git a/services/ui/display/viewport_metrics.cc b/services/ui/display/viewport_metrics.cc
index 7ad2bec74ad066c03b4c81821ea9532843bd8434..0cbacae06bb9bf991788f11a3f3a06319d44c888 100644
--- a/services/ui/display/viewport_metrics.cc
+++ b/services/ui/display/viewport_metrics.cc
@@ -10,6 +10,19 @@ namespace display {
 
 namespace {
 
+std::string TouchSupportString(Display::TouchSupport touch_support) {
+  switch (touch_support) {
+    case Display::TOUCH_SUPPORT_UNKNOWN:
+      return "unknown";
+    case Display::TOUCH_SUPPORT_AVAILABLE:
+      return "available";
+    case Display::TOUCH_SUPPORT_UNAVAILABLE:
+      return "unavailable";
+  }
+  NOTREACHED();
+  return "Invalid TouchSupport";
+}
+
 std::string RotationString(Display::Rotation rotation) {
   switch (rotation) {
     case Display::ROTATE_0:
@@ -30,10 +43,12 @@ std::string RotationString(Display::Rotation rotation) {
 std::string ViewportMetrics::ToString() const {
   return base::StringPrintf(
       "ViewportMetrics(bounds=%s, work_area=%s, pixel_size=%s, "
-      "rotation=%s, device_scale_factor=%g)",
+      "rotation=%s, touch_support=%s, "
+      "device_scale_factor=%g, ui_scale_factor=%g)",
       bounds.ToString().c_str(), work_area.ToString().c_str(),
       pixel_size.ToString().c_str(), RotationString(rotation).c_str(),
-      device_scale_factor);
+      TouchSupportString(touch_support).c_str(), device_scale_factor,
+      ui_scale_factor);
 }
 
 }  // namespace display