Revert 120092 - Reland 120074 -- Disable animations during aura tests.

ash/app_list/app_list.cc

 // Copyright (c) 2012 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 "ash/app_list/app_list.h"
 
 #include "ash/app_list/app_list_model.h"
 #include "ash/app_list/app_list_view.h"
 #include "ash/ash_switches.h"
 #include "ash/shell_delegate.h"
@@ skipping 69 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppList, private:
 
 void AppList::SetWidget(views::Widget* widget) {
   DCHECK(widget_ == NULL);
 
   if (is_visible_) {
     widget_ = widget;
+    widget_->AddObserver(this);
     GetLayer(widget_)->GetAnimator()->AddObserver(this);
     Shell::GetInstance()->AddRootWindowEventFilter(this);
 
     widget_->SetBounds(GetPreferredBounds(false));
     widget_->SetOpacity(0);
     ScheduleAnimation();
 
     widget_->Show();
   } else {
     widget->Close();
@@ skipping 11 matching lines @@
 }
 
 void AppList::ScheduleAnimation() {
   aura::Window* default_container = Shell::GetInstance()->GetContainer(
       internal::kShellWindowId_DefaultContainer);
   // |default_container| could be NULL during Shell shutdown.
   if (!default_container)
     return;
 
   ui::Layer* layer = GetLayer(widget_);
-
-  // Stop observing previous animation.
-  StopObservingImplicitAnimations();
-
   ui::ScopedLayerAnimationSettings app_list_animation(layer->GetAnimator());
-  app_list_animation.AddObserver(this);
   layer->SetBounds(GetPreferredBounds(is_visible_));
   layer->SetOpacity(is_visible_ ? 1.0 : 0.0);
 
   ui::Layer* default_container_layer = default_container->layer();
   ui::ScopedLayerAnimationSettings default_container_animation(
       default_container_layer->GetAnimator());
-  app_list_animation.AddObserver(this);
   default_container_layer->SetOpacity(is_visible_ ? 0.0 : 1.0);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppList, aura::EventFilter implementation:
 
 bool AppList::PreHandleKeyEvent(aura::Window* target,
                                 aura::KeyEvent* event) {
   return false;
 }
@@ skipping 13 matching lines @@
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
 ui::GestureStatus AppList::PreHandleGestureEvent(
     aura::Window* target,
     aura::GestureEvent* event) {
   return ui::GESTURE_STATUS_UNKNOWN;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// AppList, ui::ImplicitAnimationObserver implementation:
+// AppList, ui::LayerAnimationObserver implementation:
 
-void AppList::OnImplicitAnimationsCompleted() {
+void AppList::OnLayerAnimationEnded(
+    const ui::LayerAnimationSequence* sequence) {
   if (!is_visible_ )
     widget_->Close();
 }
 
+void AppList::OnLayerAnimationAborted(
+    const ui::LayerAnimationSequence* sequence) {
+}
+
+void AppList::OnLayerAnimationScheduled(
+    const ui::LayerAnimationSequence* sequence) {
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AppList, views::Widget::Observer implementation:
 
 void AppList::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget_ == widget);
   if (is_visible_)
     SetVisible(false);
   ResetWidget();
 }
 
 void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) {
   DCHECK(widget_ == widget);
   if (widget_ && is_visible_ && !active)
     SetVisible(false);
 }
 
 }  // namespace internal
 }  // namespace ash