ash: Improved window maximize/restore animations

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"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/view.h"
 
 #if defined(USE_ASH)
 #include "ash/wm/property_util.h"
 #endif
 
+using aura::Window;
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura::WindowPropertyWatcher
 
 class BrowserFrameAura::WindowPropertyWatcher : public aura::WindowObserver {
  public:
   explicit WindowPropertyWatcher(BrowserFrameAura* browser_frame_aura,
                                  BrowserFrame* browser_frame)
       : browser_frame_aura_(browser_frame_aura),
         browser_frame_(browser_frame) {}
 
@@ skipping 39 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::~BrowserFrameAura() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, views::ContextMenuController overrides:
 void BrowserFrameAura::ShowContextMenuForView(views::View* source,
                                               const gfx::Point& p) {
@@ skipping 71 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameAura(browser_frame, browser_view);
 }