Reland Window Control Animations for TouchView

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 947622c4bbf6d54027ee96fa2b8595998d81cf5d..6eeb8b8304690d598e4c608e3d49957bdb1a0220 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -378,6 +378,20 @@ gfx::ImageSkia BrowserNonClientFrameViewAsh::GetFaviconForTabIconView() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// views::View:
+
+void BrowserNonClientFrameViewAsh::
+    ChildPreferredSizeChanged(views::View* child) {
+// FrameCaptionButtonContainerView animates the visibility changes in
+// UpdateSizeButtonVisibility(false). Due to this a new size is not available
+// until the completion of the animation. Layout in response to the preferred
+// size changes.
+  if (child != caption_button_container_)
+    return;
+  frame()->GetRootView()->Layout();
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAsh, private:
 
 int BrowserNonClientFrameViewAsh::GetTabStripLeftInset() const {