Revert of Animate window control changes in TouchView

ash/frame/default_header_painter.cc

 // Copyright 2014 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/default_header_painter.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"  // DCHECK
@@ skipping 182 matching lines @@
     PaintHighlightForInactiveRestoredWindow(canvas);
   }
   if (frame_->widget_delegate() &&
       frame_->widget_delegate()->ShouldShowWindowTitle()) {
     PaintTitleBar(canvas);
   }
   PaintHeaderContentSeparator(canvas);
 }
 
 void DefaultHeaderPainter::LayoutHeader() {
+  caption_button_container_->Layout();
+
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
       view_->width() - caption_button_container_size.width(),
       0,
       caption_button_container_size.width(),
       caption_button_container_size.height());
-  caption_button_container_->Layout();
+
   if (window_icon_) {
     // Vertically center the window icon with respect to the caption button
     // container.
     // Floor when computing the center of |caption_button_container_|.
     int icon_offset_y =
         caption_button_container_->height() / 2 - window_icon_size_ / 2;
     window_icon_->SetBounds(HeaderPainterUtil::GetIconXOffset(), icon_offset_y,
                             window_icon_size_, window_icon_size_);
   }
 
@@ skipping 106 matching lines @@
 
 gfx::ImageSkia* DefaultHeaderPainter::GetInactiveFrameImage() const {
   int frame_image_id = (frame_->IsMaximized() || frame_->IsFullscreen()) ?
       IDR_AURA_WINDOW_HEADER_BASE :
       IDR_AURA_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       frame_image_id);
 }
 
 }  // namespace ash