summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorvarkha <varkha@chromium.org>2015-04-30 11:36:22 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-30 18:36:58 +0000
commit96dc4795ea25bcca7dc6bb6c995ad228e859e0ed (patch)
tree779335998ab95fc1cad962b5ced100221f50465a /ash
parent5347685266d20a08f84e4135bfb5fbb0ca182063 (diff)
downloadchromium_src-96dc4795ea25bcca7dc6bb6c995ad228e859e0ed.zip
chromium_src-96dc4795ea25bcca7dc6bb6c995ad228e859e0ed.tar.gz
chromium_src-96dc4795ea25bcca7dc6bb6c995ad228e859e0ed.tar.bz2
Doesn't show resize cursor near shelf for a maximized window
BUG=173017 TEST=Check the cursor at the bottom of a maximized window in Chrome OS - should be a regular arrow cursor. Review URL: https://codereview.chromium.org/1112453004 Cr-Commit-Position: refs/heads/master@{#327746}
Diffstat (limited to 'ash')
-rw-r--r--ash/frame/frame_border_hit_test_controller.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/frame/frame_border_hit_test_controller.cc b/ash/frame/frame_border_hit_test_controller.cc
index 1ce114d..856933f 100644
--- a/ash/frame/frame_border_hit_test_controller.cc
+++ b/ash/frame/frame_border_hit_test_controller.cc
@@ -49,9 +49,11 @@ int FrameBorderHitTestController::NonClientHitTest(
bool can_ever_resize = frame->widget_delegate()->CanResize();
// Don't allow overlapping resize handles when the window is maximized or
// fullscreen, as it can't be resized in those states.
- int resize_border =
- frame->IsMaximized() || frame->IsFullscreen() ? 0 :
- kResizeInsideBoundsSize;
+ int resize_border = kResizeInsideBoundsSize;
+ if (frame->IsMaximized() || frame->IsFullscreen()) {
+ resize_border = 0;
+ can_ever_resize = false;
+ }
int frame_component = view->GetHTComponentForFrame(point_in_widget,
resize_border,
resize_border,