Revert of Animate window control changes in TouchView

ash/frame/default_header_painter.cc

Index: ash/frame/default_header_painter.cc
diff --git a/ash/frame/default_header_painter.cc b/ash/frame/default_header_painter.cc
index e8a46ef3861ce011e601500ce36af6de9fe54a62..fd31d776e91913c78bc0c304370793280d4db70e 100644
--- a/ash/frame/default_header_painter.cc
+++ b/ash/frame/default_header_painter.cc
@@ -200,6 +200,8 @@
 }
 
 void DefaultHeaderPainter::LayoutHeader() {
+  caption_button_container_->Layout();
+
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
@@ -207,7 +209,7 @@
       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.