Converts mash to use the common non-client frame

ash/common/frame/header_painter_util.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 "ash/common/frame/header_painter_util.h"
 
 #include <algorithm>
 
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_window.h"
@@ skipping 66 matching lines @@
 // static
 bool HeaderPainterUtil::CanAnimateActivation(views::Widget* widget) {
   // Do not animate the header if the parent (e.g.
   // kShellWindowId_DefaultContainer) is already animating. All of the
   // implementers of HeaderPainter animate activation by continuously painting
   // during the animation. This gives the parent's animation a slower frame
   // rate.
   // TODO(sky): Expose a better way to determine this rather than assuming the
   // parent is a toplevel container.
   WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget);
-  if (!window || !window->GetParent())
+  // TODO(sky): GetParent()->GetLayer() is for mash until animations ported.
+  if (!window || !window->GetParent() || !window->GetParent()->GetLayer())
     return true;
 
   ui::LayerAnimator* parent_layer_animator =
       window->GetParent()->GetLayer()->GetAnimator();
   return !parent_layer_animator->IsAnimatingProperty(
              ui::LayerAnimationElement::OPACITY) &&
          !parent_layer_animator->IsAnimatingProperty(
              ui::LayerAnimationElement::VISIBILITY);
 }
 
 }  // namespace ash