Index: ash/frame/custom_frame_view_ash.cc |
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc |
index 169e8aef9285266ee3f6bc5ceeb65a5e41831ca0..f4422fc796e412210b6de7c1f931a5c06d13b326 100644 |
--- a/ash/frame/custom_frame_view_ash.cc |
+++ b/ash/frame/custom_frame_view_ash.cc |
@@ -202,7 +202,12 @@ |
avatar_icon_(NULL), |
caption_button_container_(NULL), |
fullscreen_visible_fraction_(0) { |
- caption_button_container_ = new FrameCaptionButtonContainerView(frame_); |
+ FrameCaptionButtonContainerView::MinimizeAllowed minimize_allowed = |
+ frame_->widget_delegate()->CanMinimize() ? |
+ FrameCaptionButtonContainerView::MINIMIZE_ALLOWED : |
+ FrameCaptionButtonContainerView::MINIMIZE_DISALLOWED; |
+ caption_button_container_ = new FrameCaptionButtonContainerView(frame_, |
+ minimize_allowed); |
caption_button_container_->UpdateSizeButtonVisibility(); |
AddChildView(caption_button_container_); |