Reland r107720 - Enable the new layer animation framework.

views/widget/native_widget_views.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/widget/native_widget_views.h"
 
 #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"
 #include "views/widget/root_view.h"
 #include "views/widget/window_manager.h"
 
 #if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
 #else
 #include "views/ime/mock_input_method.h"
@@ skipping 436 matching lines @@
     restored_bounds_ = view_->bounds();
     restored_transform_ = view_->GetTransform();
   }
 
   window_state_ = ui::SHOW_STATE_MAXIMIZED;
   gfx::Size size = GetParentNativeWidget()->GetWindowScreenBounds().size();
   SetBounds(gfx::Rect(gfx::Point(), size));
 }
 
 void NativeWidgetViews::Minimize() {
+  if (view_->layer() && view_->layer()->GetAnimator()->is_animating())
+    return;
+
   gfx::Rect view_bounds = view_->bounds();
   gfx::Rect parent_bounds = view_->parent()->bounds();
 
   if (window_state_ != ui::SHOW_STATE_MAXIMIZED) {
     restored_bounds_ = view_bounds;
     restored_transform_ = view_->GetTransform();
   }
 
   float aspect_ratio = static_cast<float>(view_bounds.width()) /
                        static_cast<float>(view_bounds.height());
@@ skipping 21 matching lines @@
 
 bool NativeWidgetViews::IsMaximized() const {
   return window_state_ == ui::SHOW_STATE_MAXIMIZED;
 }
 
 bool NativeWidgetViews::IsMinimized() const {
   return window_state_ == ui::SHOW_STATE_MINIMIZED;
 }
 
 void NativeWidgetViews::Restore() {
+  if (view_->layer() && view_->layer()->GetAnimator()->is_animating())
+    return;
+
   window_state_ = ui::SHOW_STATE_NORMAL;
   view_->SetBoundsRect(restored_bounds_);
   view_->SetTransform(restored_transform_);
 }
 
 void NativeWidgetViews::SetFullscreen(bool fullscreen) {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetViews::IsFullscreen() const {
@@ skipping 111 matching lines @@
       }
       default:
         // Everything else falls into standard client event handling.
         break;
     }
   }
   return false;
 }
 
 }  // namespace views