summaryrefslogtreecommitdiff
path: root/chromium/ui/display/manager/display_manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/display/manager/display_manager.h')
-rw-r--r--chromium/ui/display/manager/display_manager.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/chromium/ui/display/manager/display_manager.h b/chromium/ui/display/manager/display_manager.h
index 2ff69b5e70c..6de527a6c4f 100644
--- a/chromium/ui/display/manager/display_manager.h
+++ b/chromium/ui/display/manager/display_manager.h
@@ -445,8 +445,6 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
base::Optional<TouchDeviceIdentifier> touch_device_identifier);
void UpdateZoomFactor(int64_t display_id, float zoom_factor);
#endif
- // Returns the zoom foactor for the display identified by |display_id|.
- float GetZoomFactorForDisplay(int64_t display_id) const;
// Sets/gets default multi display mode.
void SetDefaultMultiDisplayModeForCurrentDisplays(MultiDisplayMode mode);
@@ -476,9 +474,17 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
// Zoom the internal display.
bool ZoomInternalDisplay(bool up);
+ // Zooms the display identified by |display_id| by increasing or decreasing
+ // its zoom factor value by 1 unit. Zooming in will have no effect on the
+ // display if it is already at its maximum zoom. Vice versa for zooming out.
+ bool ZoomDisplay(int64_t display_id, bool up);
+
// Reset the internal display zoom.
void ResetInternalDisplayZoom();
+ // Resets the zoom value to 1 for the display identified by |display_id|.
+ void ResetDisplayZoom(int64_t display_id);
+
// Notifies observers of display configuration changes.
void NotifyMetricsChanged(const Display& display, uint32_t metrics);
void NotifyDisplayAdded(const Display& display);
@@ -609,9 +615,6 @@ class DISPLAY_MANAGER_EXPORT DisplayManager
// Selected display modes for displays. Key is the displays' ID.
std::map<int64_t, ManagedDisplayMode> display_modes_;
- // Zoom level for each display.
- std::map<int64_t, float> display_zoom_factors_;
-
// When set to true, the host window's resize event updates the display's
// size. This is set to true when running on desktop environment (for
// debugging) so that resizing the host window will update the display