PlatformScreenOzone using DisplayManager

ui/display/manager/display_manager.h

Index: ui/display/manager/display_manager.h
diff --git a/ui/display/manager/display_manager.h b/ui/display/manager/display_manager.h
index 8437a3f1e9e944df527412bb6ddd7258351f0e93..0d79724a48a4f9fc9ce8b194d8da163053c5b85f 100644
--- a/ui/display/manager/display_manager.h
+++ b/ui/display/manager/display_manager.h
@@ -108,6 +108,12 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
     force_bounds_changed_ = force_bounds_changed;
   }
 
+  // When set to true, DisplayManager will use DisplayConfigurator to configure

[msw, 2016/12/19 20:02:52]

nit: It's nice to have one clear comment on the member and omit a comment
altogether (avoid duplication) on the simple accessor, and it's nice when the
accessor order matches the member ordering, but I see that's neither pattern is
really employed here, so I guess it's fine as-is.

[kylechar, 2016/12/20 15:19:46]

Good point. Odds are both the setter/member variable comments won't get updated
in sync. Removed the setter comment.

+  // displays.
+  void set_configure_displays(bool configure_displays) {
+    configure_displays_ = configure_displays;
+  }
+
   // Returns the display id of the first display in the outupt list.
   int64_t first_display_id() const { return first_display_id_; }
 
@@ -414,6 +420,11 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
 
   Delegate* delegate_ = nullptr;  // not owned.
 
+  // When set to true, DisplayManager will use DisplayConfigurator to configure
+  // displays. By default, this is set to true when running on device and false
+  // when running off device.
+  bool configure_displays_;
+
   std::unique_ptr<Screen> screen_;
 
   std::unique_ptr<DisplayLayoutStore> layout_store_;