ash: Fix blank window when maximizing an app

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

 // Copyright (c) 2012 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_frame_aura.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "grit/chromium_strings.h"
@@ skipping 26 matching lines @@
         browser_frame_(browser_frame) {}
 
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) OVERRIDE {
     if (key != aura::client::kShowStateKey)
       return;
 
     // Allow the frame to be replaced when maximizing an app.
     if (browser_frame_->non_client_view() &&
-        browser_frame_aura_->browser_view()->browser()->is_app())
-      browser_frame_->non_client_view()->UpdateFrame();
+        browser_frame_aura_->browser_view()->browser()->is_app()) {
+      // Defer frame layout when replacing the frame. Layout will occur when the
+      // window's bounds are updated. The window maximize/restore animations
+      // clone the window's layers and rely on the subsequent layout to set
+      // the layer sizes.
+      browser_frame_->non_client_view()->UpdateFrame(false);
+    }
   }
 
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE {
     // Don't do anything if we don't have our non-client view yet.
     if (!browser_frame_->non_client_view())
       return;
 
     // If the window just moved to the top of the screen, or just moved away
@@ skipping 19 matching lines @@
       browser_view_(browser_view),
       window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) {
   GetNativeWindow()->SetName("BrowserFrameAura");
   GetNativeWindow()->AddObserver(window_property_watcher_.get());
 #if defined(USE_ASH)
   if (browser_view->browser()->type() != Browser::TYPE_POPUP) {
     ash::SetPersistsAcrossAllWorkspaces(
         GetNativeWindow(),
         ash::WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_NO);
   }
-  // HACK: Don't animate app windows. They delete and rebuild their frame on
-  // maximize, which breaks the layer animations. We probably shouldn't rebuild
-  // the frame view on this transition.
-  // TODO(jamescook): Fix app window animation.  http://crbug.com/131293
-  if (browser_view->browser()->is_app()) {
-    Window* window = GetNativeWindow();
-    window->SetProperty(aura::client::kAnimationsDisabledKey, true);
-  }
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, views::ContextMenuController overrides:
 void BrowserFrameAura::ShowContextMenuForView(views::View* source,
                                               const gfx::Point& p) {
   // Only show context menu if point is in unobscured parts of browser, i.e.
   // if NonClientHitTest returns :
   // - HTCAPTION: in title bar or unobscured part of tabstrip
@@ skipping 85 matching lines @@
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameAura(browser_frame, browser_view);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, private:
 
 BrowserFrameAura::~BrowserFrameAura() {
 }