| Index: ash/display/display_manager.h
|
| diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
|
| index cb1850722ea187170ce1e49ebef318f509a5737b..16acee420a2ea160f15ec8991cfdcd4574de0413 100644
|
| --- a/ash/display/display_manager.h
|
| +++ b/ash/display/display_manager.h
|
| @@ -162,11 +162,17 @@ class ASH_EXPORT DisplayManager
|
| void SetDisplayRotation(int64 display_id, gfx::Display::Rotation rotation);
|
|
|
| // Sets the display's ui scale.
|
| + // TODO(mukai): remove this and merge into SetDisplayMode.
|
| void SetDisplayUIScale(int64 display_id, float ui_scale);
|
|
|
| // Sets the display's resolution.
|
| + // TODO(mukai): remove this and merge into SetDisplayMode.
|
| void SetDisplayResolution(int64 display_id, const gfx::Size& resolution);
|
|
|
| + // Sets the external display's configuration, including resolution change,
|
| + // ui-scale change, and device scale factor change.
|
| + void SetDisplayMode(int64 display_id, const DisplayMode& display_mode);
|
| +
|
| // Register per display properties. |overscan_insets| is NULL if
|
| // the display has no custom overscan insets.
|
| void RegisterDisplayProperty(int64 display_id,
|
|
|