arc: Remove landscape checking when get different layout type
The original landscape checking is working on Android side. In
chrome side it actually not need this transpose.
BUG=b:211609015
TEST=manually test in two kind of display orientation.
Change-Id: I603de67223da41ed891b4b33f160da77fb23fa3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3439155
Reviewed-by: Yuichiro Hanada <yhanada@chromium.org>
Commit-Queue: Shengsong Tan <sstan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#967708}
diff --git a/chrome/browser/ash/arc/window_predictor/window_predictor.cc b/chrome/browser/ash/arc/window_predictor/window_predictor.cc
index 7ae35b09..778b6db 100644
--- a/chrome/browser/ash/arc/window_predictor/window_predictor.cc
+++ b/chrome/browser/ash/arc/window_predictor/window_predictor.cc
@@ -26,18 +26,12 @@
// TODO(sstan): Replace by calculating from real display scale factor.
constexpr float kArcUniformScaleFactor = 1.2;
-gfx::Size GetPhoneSize(bool is_disp_landscape) {
- auto result = kDefaultPortraitPhoneSize;
- if (is_disp_landscape)
- result.Transpose();
- return ScaleToCeiledSize(result, kArcUniformScaleFactor);
+gfx::Size GetPhoneSize() {
+ return ScaleToCeiledSize(kDefaultPortraitPhoneSize, kArcUniformScaleFactor);
}
-gfx::Size GetTabletSize(bool is_disp_landscape) {
- auto result = kDefaultLandscapeTabletSize;
- if (!is_disp_landscape)
- result.Transpose();
- return ScaleToCeiledSize(result, kArcUniformScaleFactor);
+gfx::Size GetTabletSize() {
+ return ScaleToCeiledSize(kDefaultLandscapeTabletSize, kArcUniformScaleFactor);
}
// Get window bounds in the middle of a display in global coordinate.
@@ -97,16 +91,14 @@
case arc::mojom::WindowSizeType::kTabletSize:
window_info->state =
static_cast<int32_t>(chromeos::WindowStateType::kNormal);
- window_info->bounds =
- GetMiddleBounds(disp, GetTabletSize(disp.is_landscape()));
+ window_info->bounds = GetMiddleBounds(disp, GetTabletSize());
break;
case arc::mojom::WindowSizeType::kPhoneSize:
case arc::mojom::WindowSizeType::kUnknown:
default:
window_info->state =
static_cast<int32_t>(chromeos::WindowStateType::kNormal);
- window_info->bounds =
- GetMiddleBounds(disp, GetPhoneSize(disp.is_landscape()));
+ window_info->bounds = GetMiddleBounds(disp, GetPhoneSize());
}
return window_info;