Pass device scale factor from display to ws.

services/ui/display/platform_screen_ozone.h

Index: services/ui/display/platform_screen_ozone.h
diff --git a/services/ui/display/platform_screen_ozone.h b/services/ui/display/platform_screen_ozone.h
index 88d2482227fd92521309e2492cf01cb583e317bc..ac2e60eae929ed14a18220c0ae0a2de7f09b99eb 100644
--- a/services/ui/display/platform_screen_ozone.h
+++ b/services/ui/display/platform_screen_ozone.h
@@ -47,12 +47,13 @@ class PlatformScreenOzone
   // TODO(kylechar): This struct is just temporary until we migrate
   // DisplayManager code out of ash so it can be used here.
   struct DisplayInfo {
-    DisplayInfo(int64_t new_id, const gfx::Rect& new_bounds)
-        : id(new_id), bounds(new_bounds) {}
-
-    int64_t id;
-    // The display bounds.
+    int64_t id = Display::kInvalidDisplayID;
+    // The display bounds in DIP.
     gfx::Rect bounds;
+    // Display size in DDP.
+    gfx::Size pixel_size;
+    // The display device pixel scale factor, either 1 or 2.
+    float device_scale_factor = 1.0f;
     // The display bounds have been modified and delegate should be updated.
     bool modified = false;
     // The display has been removed and delegate should be updated.
@@ -90,6 +91,9 @@ class PlatformScreenOzone
   // iterator if there is no display with that id.
   CachedDisplayIterator GetCachedDisplayIterator(int64_t display_id);
 
+  // Converts |snapshot| into a DisplayInfo.
+  DisplayInfo DisplayInfoFromSnapshot(ui::DisplaySnapshot* snapshot);

[sky, 2016/09/22 21:42:06]

If possible, make this take a const ui::DisplaySnapshot& as it seems like
snapshot shouldn't be modified in this call.

[kylechar, 2016/09/23 13:22:32]

Done.

+
   // ui::DisplayConfigurator::Observer:
   void OnDisplayModeChanged(
       const ui::DisplayConfigurator::DisplayStateList& displays) override;