Revert of Animate window control changes in TouchView

chrome/browser/ui/views/frame/browser_header_painter_ash.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 "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
 
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/header_painter_util.h"
 #include "base/logging.h"  // DCHECK
 #include "chrome/browser/ui/browser.h"
@@ skipping 214 matching lines @@
   }
 }
 
 void BrowserHeaderPainterAsh::LayoutHeader() {
   // Purposefully set |painted_height_| to an invalid value. We cannot use
   // |painted_height_| because the computation of |painted_height_| may depend
   // on having laid out the window controls.
   painted_height_ = -1;
 
   UpdateCaptionButtonImages();
+  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.
     int icon_size = ash::HeaderPainterUtil::GetDefaultIconSize();
     int icon_offset_y = (caption_button_container_->height() - icon_size) / 2;
     window_icon_->SetBounds(ash::HeaderPainterUtil::GetIconXOffset(),
         icon_offset_y, icon_size, icon_size);
   }
 }
@@ skipping 174 matching lines @@
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {
   return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,
       caption_button_container_, BrowserFrame::GetTitleFontList());
 }