Revert or Reland Window Control Animations for TouchView

ash/frame/caption_buttons/frame_caption_button.cc

 // Copyright 2013 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/frame/caption_buttons/frame_caption_button.h"
 
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/compositor/layer.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
-#include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 // The duration of the crossfade animation when swapping the button's images.
 const int kSwapImagesAnimationDurationMs = 200;
 
 // The duration of the fade out animation of the old icon during a crossfade
 // animation as a ratio of |kSwapImagesAnimationDurationMs|.
 const float kFadeOutRatio = 0.5f;
 
 }  // namespace
 
 // static
 const char FrameCaptionButton::kViewClassName[] = "FrameCaptionButton";
 
 FrameCaptionButton::FrameCaptionButton(views::ButtonListener* listener,
                                        CaptionButtonIcon icon)
     : CustomButton(listener),
       icon_(icon),
       paint_as_active_(false),
       icon_image_id_(-1),
       inactive_icon_image_id_(-1),
       hovered_background_image_id_(-1),
       pressed_background_image_id_(-1),
       swap_images_animation_(new gfx::SlideAnimation(this)) {
   swap_images_animation_->Reset(1);
 
-  SetPaintToLayer(true);
-  SetFillsBoundsOpaquely(false);
-  set_layer_owner_delegate(this);
-
   // Do not flip the gfx::Canvas passed to the OnPaint() method. The snap left
   // and snap right button icons should not be flipped. The other icons are
   // horizontally symmetrical.
 }
 
 FrameCaptionButton::~FrameCaptionButton() {
 }
 
 void FrameCaptionButton::SetImages(CaptionButtonIcon icon,
                                    Animate animate,
@@ skipping 117 matching lines @@
                                        const gfx::ImageSkia& to_center,
                                        int alpha) {
   SkPaint paint;
   paint.setAlpha(alpha);
   canvas->DrawImageInt(to_center,
                        (width() - to_center.width()) / 2,
                        (height() - to_center.height()) / 2,
                        paint);
 }
 
-void FrameCaptionButton::OnLayerRecreated(ui::Layer* old_layer,
-                                          ui::Layer* new_layer) {
-  GetWidget()->UpdateRootLayers();
-}
-
 }  // namespace ash