summaryrefslogtreecommitdiffstats
path: root/ash/display/display_manager.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 11:47:43 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 11:47:43 +0000
commit28cf89bf26975fde4694ca0e2c4aaaf2aaed2f7a (patch)
tree2f02a7bcdd6340d12aab0181862fc16c7d5b7f5f /ash/display/display_manager.h
parentbe0653263e960f40a47ed01a7b300dbeb0cf806c (diff)
downloadchromium_src-28cf89bf26975fde4694ca0e2c4aaaf2aaed2f7a.zip
chromium_src-28cf89bf26975fde4694ca0e2c4aaaf2aaed2f7a.tar.gz
chromium_src-28cf89bf26975fde4694ca0e2c4aaaf2aaed2f7a.tar.bz2
Revert "Add shortcut keys to ui scaling"
Add shortcut keys to ui scaling - Round root window size because it can be fractional size when root_window_scale_ is specified. - Remove scaling option from about:flags. - Rotate display where the mouse is in. BUG=179997,119268 Review URL: https://chromiumcodereview.appspot.com/12848004 TBR=oshima@chromium.org BUG=none Review URL: https://codereview.chromium.org/12690013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_manager.h')
-rw-r--r--ash/display/display_manager.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index ce51512..cfc0cb6 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -43,7 +43,7 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
// Used to emulate display change when run in a desktop environment instead
// of on a device.
static void CycleDisplay();
- static void ToggleDisplayScaleFactor();
+ static void ToggleDisplayScale();
// When set to true, the MonitorManager calls OnDisplayBoundsChanged
// even if the display's bounds didn't change. Used to swap primary
@@ -86,13 +86,6 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver {
// Sets the display's rotation.
void SetDisplayRotation(int64 display_id, gfx::Display::Rotation rotation);
- // Sets the display's ui scale.
- void SetDisplayUIScale(int64 display_id, float ui_scale);
-
- // Tells if display rotation/ui scaling features are enabled.
- bool IsDisplayRotationEnabled() const;
- bool IsDisplayUIScalingEnabled() const;
-
// Returns the current overscan insets for the specified |display_id|.
// Returns an empty insets (0, 0, 0, 0) if no insets are specified for
// the display.