Converts mash to use the common non-client frame

ash/common/frame/header_painter_util.cc

Index: ash/common/frame/header_painter_util.cc
diff --git a/ash/common/frame/header_painter_util.cc b/ash/common/frame/header_painter_util.cc
index dfd545455215b19481037c77e49c457bfb170a14..f9e1595840e3c1191b8bb01bfdae9a6da3aa1a30 100644
--- a/ash/common/frame/header_painter_util.cc
+++ b/ash/common/frame/header_painter_util.cc
@@ -84,7 +84,8 @@ bool HeaderPainterUtil::CanAnimateActivation(views::Widget* widget) {
   // 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 =