| Index: ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| index 8a049908b152249b743e15ad20054736645008c4..03f0297c839dc2cf9803a4542664c09a563e383c 100644
|
| --- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| +++ b/ash/frame/caption_buttons/frame_caption_button_container_view.cc
|
| @@ -205,12 +205,12 @@ void FrameCaptionButtonContainerView::UpdateSizeButtonVisibility() {
|
| }
|
|
|
| void FrameCaptionButtonContainerView::SetButtonSize(const gfx::Size& size) {
|
| - minimize_button_->set_size(size);
|
| - size_button_->set_size(size);
|
| - close_button_->set_size(size);
|
| + minimize_button_->set_preferred_size(size);
|
| + size_button_->set_preferred_size(size);
|
| + close_button_->set_preferred_size(size);
|
| }
|
|
|
| -gfx::Size FrameCaptionButtonContainerView::GetPreferredSize() const {
|
| +gfx::Size FrameCaptionButtonContainerView::CalculatePreferredSize() const {
|
| int width = 0;
|
| for (int i = 0; i < child_count(); ++i) {
|
| const views::View* child = child_at(i);
|
|
|