| 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 5a8e0e12c3f147f1d062e4682a320bf8ccefefa1..272752c12e2caf65ba88db6451c00eff1125f655 100644
|
| --- a/ash/frame/custom_frame_view_ash.cc
|
| +++ b/ash/frame/custom_frame_view_ash.cc
|
| @@ -299,7 +299,7 @@ void CustomFrameViewAsh::ActivationChanged(bool active) {
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // CustomFrameViewAsh, views::View overrides:
|
|
|
| -gfx::Size CustomFrameViewAsh::GetPreferredSize() const {
|
| +gfx::Size CustomFrameViewAsh::CalculatePreferredSize() const {
|
| gfx::Size pref = frame_->client_view()->GetPreferredSize();
|
| gfx::Rect bounds(0, 0, pref.width(), pref.height());
|
| return frame_->non_client_view()
|
|
|