Commit 8e2fd3f6 authored by Ivan Sandrk's avatar Ivan Sandrk Committed by Commit Bot

Revert "Remove unnecessary window check change in InteriorResizeHandleTargeter"

This reverts commit 173fb79b.

Reason for revert: Breaks Chrome OS Kiosk - crbug.com/950437

Original change's description:
> Remove unnecessary window check change in InteriorResizeHandleTargeter
> 
> ShouldUseExtendedBounds returns true only for children, which dones't
> have its own window state, so this shouldn't be necessary.
> 
> Bug: 912191
> Test: no functional change. all tests should pass.
> Change-Id: Ia3ea35a59d860ad62a0517daa66f6f1a5b26c070
> Reviewed-on: https://chromium-review.googlesource.com/c/1385122
> Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
> Reviewed-by: Evan Stade <estade@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#618260}

TBR=oshima@chromium.org,estade@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 912191, 950437
Change-Id: Icaa8bae2ca7fb27e30528b13e4b5948da9ef145d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1559323Reviewed-by: default avatarIvan Šandrk <isandrk@chromium.org>
Commit-Queue: Ivan Šandrk <isandrk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649124}
parent d7339a5c
...@@ -101,6 +101,14 @@ class InteriorResizeHandleTargeter : public aura::WindowTargeter { ...@@ -101,6 +101,14 @@ class InteriorResizeHandleTargeter : public aura::WindowTargeter {
} }
bool ShouldUseExtendedBounds(const aura::Window* target) const override { bool ShouldUseExtendedBounds(const aura::Window* target) const override {
// Fullscreen/maximized windows can't be drag-resized.
const WindowState* window_state = GetWindowState(window());
const WindowState* target_window_state = GetWindowState(target);
if ((window_state && window_state->IsMaximizedOrFullscreenOrPinned()) ||
(target_window_state && !target_window_state->CanResize())) {
return false;
}
// The shrunken hit region only applies to children of |window()|. // The shrunken hit region only applies to children of |window()|.
return target->parent() == window(); return target->parent() == window();
} }
......
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