Revert or Reland Window Control Animations for TouchView

chrome/browser/ui/views/frame/browser_header_painter_ash.cc

Index: chrome/browser/ui/views/frame/browser_header_painter_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index 13cbd52792e6f43d66833b8eb0c24a3e115c3991..be2dbc75e27497608f0689bf925628f852811823 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -232,6 +232,7 @@ void BrowserHeaderPainterAsh::LayoutHeader() {
   painted_height_ = -1;
 
   UpdateCaptionButtonImages();
+  caption_button_container_->Layout();
 
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
@@ -240,7 +241,6 @@ void BrowserHeaderPainterAsh::LayoutHeader() {
       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