Commit 43a2708a authored by Mitsuru Oshima's avatar Mitsuru Oshima Committed by Commit Bot

Remove --ash-enable-mirrored-screen flag

Bug: 924322
Test: None
Change-Id: Ief0e8239031f82984c48f08dbf332584f67c5b48
Reviewed-on: https://chromium-review.googlesource.com/c/1428839Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625385}
parent e53623ab
...@@ -55,13 +55,6 @@ gfx::Transform CreateInsetsAndScaleTransform(const gfx::Insets& insets, ...@@ -55,13 +55,6 @@ gfx::Transform CreateInsetsAndScaleTransform(const gfx::Insets& insets,
return transform; return transform;
} }
gfx::Transform CreateMirrorTransform(const display::Display& display) {
gfx::Transform transform;
transform.matrix().set3x3(-1, 0, 0, 0, 1, 0, 0, 0, 1);
transform.Translate(-display.size().width(), 0);
return transform;
}
// RootWindowTransformer for ash environment. // RootWindowTransformer for ash environment.
class AshRootWindowTransformer : public RootWindowTransformer { class AshRootWindowTransformer : public RootWindowTransformer {
public: public:
...@@ -75,14 +68,6 @@ class AshRootWindowTransformer : public RootWindowTransformer { ...@@ -75,14 +68,6 @@ class AshRootWindowTransformer : public RootWindowTransformer {
CreateInsetsAndScaleTransform(host_insets_, CreateInsetsAndScaleTransform(host_insets_,
display.device_scale_factor()) * display.device_scale_factor()) *
CreateRootWindowRotationTransform(root, display); CreateRootWindowRotationTransform(root, display);
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshEnableMirroredScreen)) {
// Apply the transform that flips the screen image horizontally so that
// the screen looks normal when reflected on a mirror.
root_window_bounds_transform_ =
root_window_bounds_transform_ * CreateMirrorTransform(display);
}
transform_ = root_window_bounds_transform_; transform_ = root_window_bounds_transform_;
MagnificationController* magnifier = MagnificationController* magnifier =
Shell::Get()->magnification_controller(); Shell::Get()->magnification_controller();
......
...@@ -53,9 +53,6 @@ const char kAshEnableTabletMode[] = "enable-touchview"; ...@@ -53,9 +53,6 @@ const char kAshEnableTabletMode[] = "enable-touchview";
// Enable the wayland server. // Enable the wayland server.
const char kAshEnableWaylandServer[] = "enable-wayland-server"; const char kAshEnableWaylandServer[] = "enable-wayland-server";
// Enables mirrored screen.
const char kAshEnableMirroredScreen[] = "ash-enable-mirrored-screen";
// Enables the stylus tools next to the status area. // Enables the stylus tools next to the status area.
const char kAshForceEnableStylusTools[] = "force-enable-stylus-tools"; const char kAshForceEnableStylusTools[] = "force-enable-stylus-tools";
......
...@@ -27,7 +27,6 @@ ASH_PUBLIC_EXPORT extern const char kAshEnableMagnifierKeyScroller[]; ...@@ -27,7 +27,6 @@ ASH_PUBLIC_EXPORT extern const char kAshEnableMagnifierKeyScroller[];
ASH_PUBLIC_EXPORT extern const char kAshEnablePaletteOnAllDisplays[]; ASH_PUBLIC_EXPORT extern const char kAshEnablePaletteOnAllDisplays[];
ASH_PUBLIC_EXPORT extern const char kAshEnableTabletMode[]; ASH_PUBLIC_EXPORT extern const char kAshEnableTabletMode[];
ASH_PUBLIC_EXPORT extern const char kAshEnableWaylandServer[]; ASH_PUBLIC_EXPORT extern const char kAshEnableWaylandServer[];
ASH_PUBLIC_EXPORT extern const char kAshEnableMirroredScreen[];
ASH_PUBLIC_EXPORT extern const char kAshForceEnableStylusTools[]; ASH_PUBLIC_EXPORT extern const char kAshForceEnableStylusTools[];
ASH_PUBLIC_EXPORT extern const char kAshPowerButtonPosition[]; ASH_PUBLIC_EXPORT extern const char kAshPowerButtonPosition[];
ASH_PUBLIC_EXPORT extern const char kAshUiMode[]; ASH_PUBLIC_EXPORT extern const char kAshUiMode[];
......
...@@ -1636,13 +1636,6 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -1636,13 +1636,6 @@ const FeatureEntry kFeatureEntries[] = {
kOsAll, kOsAll,
SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts), SINGLE_VALUE_TYPE(ash::switches::kAshDebugShortcuts),
}, },
{
"ash-enable-mirrored-screen",
flag_descriptions::kAshEnableMirroredScreenName,
flag_descriptions::kAshEnableMirroredScreenDescription,
kOsCrOS,
SINGLE_VALUE_TYPE(ash::switches::kAshEnableMirroredScreen),
},
{"ash-shelf-color", flag_descriptions::kAshShelfColorName, {"ash-shelf-color", flag_descriptions::kAshShelfColorName,
flag_descriptions::kAshShelfColorDescription, kOsCrOS, flag_descriptions::kAshShelfColorDescription, kOsCrOS,
MULTI_VALUE_TYPE(kAshShelfColorChoices)}, MULTI_VALUE_TYPE(kAshShelfColorChoices)},
......
...@@ -167,11 +167,6 @@ ...@@ -167,11 +167,6 @@
// "owners": [ "your-team" ], // "owners": [ "your-team" ],
"expiry_milestone": 76 "expiry_milestone": 76
}, },
{
"name": "ash-enable-mirrored-screen",
// "owners": [ "your-team" ],
"expiry_milestone": 76
},
{ {
"name": "ash-enable-night-light", "name": "ash-enable-night-light",
// "owners": [ "your-team" ], // "owners": [ "your-team" ],
......
...@@ -3107,11 +3107,6 @@ const char kAshEnableDisplayMoveWindowAccelsName[] = ...@@ -3107,11 +3107,6 @@ const char kAshEnableDisplayMoveWindowAccelsName[] =
const char kAshEnableDisplayMoveWindowAccelsDescription[] = const char kAshEnableDisplayMoveWindowAccelsDescription[] =
"Enable shortcuts for moving window between displays."; "Enable shortcuts for moving window between displays.";
const char kAshEnableMirroredScreenName[] = "Enable mirrored screen mode.";
const char kAshEnableMirroredScreenDescription[] =
"Enable the mirrored screen mode. This mode flips the screen image "
"horizontally.";
const char kAshEnablePersistentWindowBoundsName[] = const char kAshEnablePersistentWindowBoundsName[] =
"Enable persistent window bounds in multi-displays scenario."; "Enable persistent window bounds in multi-displays scenario.";
const char kAshEnablePersistentWindowBoundsDescription[] = const char kAshEnablePersistentWindowBoundsDescription[] =
......
...@@ -1861,9 +1861,6 @@ extern const char kArcVpnDescription[]; ...@@ -1861,9 +1861,6 @@ extern const char kArcVpnDescription[];
extern const char kAshEnableDisplayMoveWindowAccelsName[]; extern const char kAshEnableDisplayMoveWindowAccelsName[];
extern const char kAshEnableDisplayMoveWindowAccelsDescription[]; extern const char kAshEnableDisplayMoveWindowAccelsDescription[];
extern const char kAshEnableMirroredScreenName[];
extern const char kAshEnableMirroredScreenDescription[];
extern const char kAshEnablePersistentWindowBoundsName[]; extern const char kAshEnablePersistentWindowBoundsName[];
extern const char kAshEnablePersistentWindowBoundsDescription[]; extern const char kAshEnablePersistentWindowBoundsDescription[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment