summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorpkotwicz <pkotwicz@chromium.org>2014-09-22 19:46:42 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-23 02:46:55 +0000
commite72536c13ce577b06cdf06f07778e8c3c5598485 (patch)
tree619be2052a4b4f4e4c251e3382033cfc7fbe8729 /apps
parentfa93145ce5a6d4802b056384e33c823609b3e136 (diff)
downloadchromium_src-e72536c13ce577b06cdf06f07778e8c3c5598485.zip
chromium_src-e72536c13ce577b06cdf06f07778e8c3c5598485.tar.gz
chromium_src-e72536c13ce577b06cdf06f07778e8c3c5598485.tar.bz2
Prevent frameless packaged apps from being resized to 0x0 on CrOS
BUG=408049 TEST=Manual, see bug Review URL: https://codereview.chromium.org/586323002 Cr-Commit-Position: refs/heads/master@{#296133}
Diffstat (limited to 'apps')
-rw-r--r--apps/ui/views/app_window_frame_view.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
index e706af2..60645d0 100644
--- a/apps/ui/views/app_window_frame_view.cc
+++ b/apps/ui/views/app_window_frame_view.cc
@@ -323,8 +323,10 @@ const char* AppWindowFrameView::GetClassName() const { return kViewClassName; }
gfx::Size AppWindowFrameView::GetMinimumSize() const {
gfx::Size min_size = widget_->client_view()->GetMinimumSize();
- if (!draw_frame_)
+ if (!draw_frame_) {
+ min_size.SetToMax(gfx::Size(1, 1));
return min_size;
+ }
// Ensure we can display the top of the caption area.
gfx::Rect client_bounds = GetBoundsForClientView();