| Index: views/widget/native_widget_views.cc
|
| diff --git a/views/widget/native_widget_views.cc b/views/widget/native_widget_views.cc
|
| index d1b372abed1a8932b97c5ffde7b6a7456ddc0665..d1c31893b89631beedc457a683771e690af2eb93 100644
|
| --- a/views/widget/native_widget_views.cc
|
| +++ b/views/widget/native_widget_views.cc
|
| @@ -6,6 +6,8 @@
|
|
|
| #include "base/bind.h"
|
| #include "ui/gfx/compositor/compositor.h"
|
| +#include "ui/gfx/compositor/layer.h"
|
| +#include "ui/gfx/compositor/layer_animator.h"
|
| #include "views/view.h"
|
| #include "views/views_delegate.h"
|
| #include "views/widget/native_widget_view.h"
|
| @@ -443,6 +445,9 @@ void NativeWidgetViews::Maximize() {
|
| }
|
|
|
| void NativeWidgetViews::Minimize() {
|
| + if (view_->layer() && view_->layer()->GetAnimator().IsAnimating())
|
| + return;
|
| +
|
| gfx::Rect view_bounds = view_->bounds();
|
| gfx::Rect parent_bounds = view_->parent()->bounds();
|
|
|
| @@ -484,6 +489,9 @@ bool NativeWidgetViews::IsMinimized() const {
|
| }
|
|
|
| void NativeWidgetViews::Restore() {
|
| + if (view_->layer() && view_->layer()->GetAnimator().IsAnimating())
|
| + return;
|
| +
|
| window_state_ = ui::SHOW_STATE_NORMAL;
|
| view_->SetBoundsRect(restored_bounds_);
|
| view_->SetTransform(restored_transform_);
|
|
|