Index: ash/wm/custom_frame_view_ash.cc |
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc |
index 85082d3a9c4b75b2718a04666d5b68e342e4c772..2f26529c65e37cb3734c6e667b37085e9a96ebe1 100644 |
--- a/ash/wm/custom_frame_view_ash.cc |
+++ b/ash/wm/custom_frame_view_ash.cc |
@@ -475,7 +475,14 @@ gfx::Size CustomFrameViewAsh::GetMinimumSize() { |
} |
gfx::Size CustomFrameViewAsh::GetMaximumSize() { |
- return frame_->client_view()->GetMaximumSize(); |
+ gfx::Size max_client_size(frame_->client_view()->GetMaximumSize()); |
+ return gfx::Size( |
+ max_client_size.width() == 0 |
+ ? 0 |
+ : std::max(header_view_->GetMinimumWidth(), max_client_size.width()), |
+ max_client_size.height() == 0 |
+ ? 0 |
+ : NonClientTopBorderHeight() + max_client_size.height()); |
pkotwicz
2014/03/07 01:45:14
Optional Nit: This might be easier to read
int wi
tmdiep
2014/03/07 02:08:35
Done.
|
} |
void CustomFrameViewAsh::SchedulePaintInRect(const gfx::Rect& r) { |