Gets mustash frames looking like that of ash

mash/wm/frame/header_painter_util.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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/frame/header_painter_util.h"
+#include "mash/wm/frame/header_painter_util.h"
 
 #include <algorithm>
 
-#include "ui/aura/window.h"
-#include "ui/compositor/layer.h"
-#include "ui/compositor/layer_animator.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Radius of the header's top corners when the window is restored.
 const int kTopCornerRadiusWhenRestored = 2;
 
@@ skipping 12 matching lines @@
 // In the pre-Ash era the web content area had a frame along the left edge, so
 // user-generated theme images for the new tab page assume they are shifted
 // right relative to the header.  Now that we have removed the left edge frame
 // we need to copy the theme image for the window header from a few pixels
 // inset to preserve alignment with the NTP image, or else we'll break a bunch
 // of existing themes.  We do something similar on OS X for the same reason.
 const int kThemeFrameImageInsetX = 5;
 
 }  // namespace
 
-namespace ash {
+namespace mash {
+namespace wm {
 
 // static
 int HeaderPainterUtil::GetTopCornerRadiusWhenRestored() {
   return kTopCornerRadiusWhenRestored;
 }
 
 // static
 int HeaderPainterUtil::GetDefaultLeftViewXInset() {
   return kDefaultLeftViewXInset;
 }
@@ skipping 13 matching lines @@
   int height = title_font_list.GetHeight();
   // Floor when computing the center of |caption_button_container| and when
   // computing the center of the text.
   int y = std::max(0, (right_view->height() / 2) - (height / 2));
   int width = std::max(0, right_view->x() - kTitleCaptionButtonSpacing - x);
   return gfx::Rect(x, y, width, height);
 }
 
 // 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.
-  aura::Window* window = widget->GetNativeWindow();
-  if (!window->parent())
-    return true;
-
-  ui::LayerAnimator* parent_layer_animator =
-      window->parent()->layer()->GetAnimator();
-  return !parent_layer_animator->IsAnimatingProperty(
-             ui::LayerAnimationElement::OPACITY) &&
-         !parent_layer_animator->IsAnimatingProperty(
-             ui::LayerAnimationElement::VISIBILITY);
+  return true;
 }
 
-}  // namespace ash
+}  // namespace wm
+}  // namespace mash