Revert 107715 - Enable the new layer animation framework.

views/desktop/desktop_window_view.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/desktop/desktop_window_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/transform.h"
-#include "ui/gfx/compositor/layer.h"
-#include "ui/gfx/compositor/layer_animator.h"
 #include "views/desktop/desktop_background.h"
 #include "views/desktop/desktop_window_manager.h"
+#include "views/layer_property_setter.h"
 #include "views/widget/native_widget_view.h"
 #include "views/widget/native_widget_views.h"
 #include "views/widget/widget.h"
 #include "views/window/native_frame_view.h"
 
 #if defined(USE_AURA)
 #include "views/widget/native_widget_aura.h"
 #elif defined(OS_WIN)
 #include "views/widget/native_widget_win.h"
 #elif defined(USE_WAYLAND)
@@ skipping 130 matching lines @@
 
 void DesktopWindowView::CreateTestWindow(const string16& title,
                                          SkColor color,
                                          gfx::Rect initial_bounds,
                                          bool rotate) {
   views::Widget* window = views::Widget::CreateWindowWithBounds(
       new TestWindowContentView(title, color),
       initial_bounds);
   window->Show();
 
-  NativeWidgetViews* native_widget_views =
-      static_cast<NativeWidgetViews*>(window->native_widget());
-
   if (rotate) {
     ui::Transform transform;
     transform.SetRotate(90.0f);
     transform.SetTranslateX(window->GetWindowScreenBounds().width());
-    native_widget_views->GetView()->SetTransform(transform);
-  }
-
-  native_widget_views->GetView()->SetPaintToLayer(true);
-  if (native_widget_views->GetView()->layer()) {
-    native_widget_views->GetView()->layer()->SetAnimator(
-        ui::LayerAnimator::CreateImplicitAnimator());
+    static_cast<NativeWidgetViews*>(window->native_widget())->GetView()->
+        SetTransform(transform);
   }
 }
 
 void DesktopWindowView::AddObserver(DesktopWindowView::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void DesktopWindowView::RemoveObserver(DesktopWindowView::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
@@ skipping 76 matching lines @@
       return NULL;
 
     case DESKTOP_OTHER:
       return new NativeFrameView(widget_);
   }
   return NULL;
 }
 
 }  // namespace desktop
 }  // namespace views