Gets mustash frames looking like that of ash

mash/wm/frame/default_header_painter.h

-// 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.
 
-#ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
-#define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#ifndef MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
+#define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
 
-#include "ash/ash_export.h"
-#include "ash/frame/header_painter.h"
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"  // override
-#include "base/gtest_prod_util.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "mash/wm/frame/header_painter.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/animation/animation_delegate.h"
 
 namespace gfx {
 class ImageSkia;
 class Rect;
 class SlideAnimation;
 }
 namespace views {
 class View;
 class Widget;
 }
 
-namespace ash {
+namespace mash {
+namespace wm {
+
 class FrameCaptionButtonContainerView;
 
 // Helper class for painting the default window header.
-class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
-                                        public gfx::AnimationDelegate {
+class DefaultHeaderPainter : public HeaderPainter,
+                             public gfx::AnimationDelegate {
  public:
   DefaultHeaderPainter();
   ~DefaultHeaderPainter() override;
 
   // DefaultHeaderPainter does not take ownership of any of the parameters.
   void Init(views::Widget* frame,
             views::View* header_view,
             FrameCaptionButtonContainerView* caption_button_container);
 
   // HeaderPainter overrides:
   int GetMinimumHeaderWidth() const override;
   void PaintHeader(gfx::Canvas* canvas, Mode mode) override;
   void LayoutHeader() override;
   int GetHeaderHeight() const override;
   int GetHeaderHeightForPainting() const override;
   void SetHeaderHeightForPainting(int height) override;
   void SchedulePaintForTitle() override;
   void UpdateLeftViewXInset(int left_view_x_inset) override;
 
   // Sets the left header view for the header. Passing NULL removes the view.
   void UpdateLeftHeaderView(views::View* left_header_view);
 
   // Sets the active and inactive frame colors. Note the inactive frame color
   // will have some transparency added when the frame is drawn.
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, TitleIconAlignment);
-  FRIEND_TEST_ALL_PREFIXES(DefaultHeaderPainterTest, LightIcons);
-
   // gfx::AnimationDelegate override:
   void AnimationProgressed(const gfx::Animation* animation) override;
 
   // Paints highlight around the edge of the header for inactive restored
   // windows.
   void PaintHighlightForInactiveRestoredWindow(gfx::Canvas* canvas);
 
   // Paints the title bar, primarily the title string.
   void PaintTitleBar(gfx::Canvas* canvas);
 
@@ skipping 39 matching lines @@
   Mode mode_;
 
   // Whether the header is painted for the first time.
   bool initial_paint_;
 
   scoped_ptr<gfx::SlideAnimation> activation_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
 };
 
-}  // namespace ash
+}  // namespace wm
+}  // namespace mash
 
-#endif  // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#endif  // MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_