Gets mustash frames looking like that of ash

mash/wm/frame/default_header_painter.cc

Index: mash/wm/frame/default_header_painter.cc
diff --git a/ash/frame/default_header_painter.cc b/mash/wm/frame/default_header_painter.cc
similarity index 71%
copy from ash/frame/default_header_painter.cc
copy to mash/wm/frame/default_header_painter.cc
index 62a8465748b729fdcc2a512936fdaf31200aa6c4..755ad7f7fa31e999f496b7ef33a5faeeb7ac2394 100644
--- a/ash/frame/default_header_painter.cc
+++ b/mash/wm/frame/default_header_painter.cc
@@ -1,14 +1,14 @@
-// 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/default_header_painter.h"
+#include "mash/wm/frame/default_header_painter.h"
 
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/header_painter_util.h"
 #include "base/debug/leak_annotations.h"
-#include "base/logging.h"  // DCHECK
-#include "grit/ash_resources.h"
+#include "base/logging.h"
+#include "grit/mash_wm_resources.h"
+#include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "mash/wm/frame/header_painter_util.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -50,11 +50,14 @@ void TileRoundRect(gfx::Canvas* canvas,
                    int corner_radius) {
   SkRect rect = gfx::RectToSkRect(bounds);
   const SkScalar corner_radius_scalar = SkIntToScalar(corner_radius);
-  SkScalar radii[8] = {
-      corner_radius_scalar, corner_radius_scalar,  // top-left
-      corner_radius_scalar, corner_radius_scalar,  // top-right
-      0, 0,   // bottom-right
-      0, 0};  // bottom-left
+  SkScalar radii[8] = {corner_radius_scalar,
+                       corner_radius_scalar,  // top-left
+                       corner_radius_scalar,
+                       corner_radius_scalar,  // top-right
+                       0,
+                       0,  // bottom-right
+                       0,
+                       0};  // bottom-left
   SkPath path;
   path.addRoundRect(rect, radii, SkPath::kCW_Direction);
   canvas->DrawPath(path, paint);
@@ -70,7 +73,8 @@ const gfx::FontList& GetTitleFontList() {
 
 }  // namespace
 
-namespace ash {
+namespace mash {
+namespace wm {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
@@ -88,8 +92,7 @@ DefaultHeaderPainter::DefaultHeaderPainter()
       initial_paint_(true),
       activation_animation_(new gfx::SlideAnimation(this)) {}
 
-DefaultHeaderPainter::~DefaultHeaderPainter() {
-}
+DefaultHeaderPainter::~DefaultHeaderPainter() {}
 
 void DefaultHeaderPainter::Init(
     views::Widget* frame,
@@ -108,7 +111,7 @@ int DefaultHeaderPainter::GetMinimumHeaderWidth() const {
   // Ensure we have enough space for the window icon and buttons. We allow
   // the title string to collapse to zero width.
   return GetTitleBounds().x() +
-      caption_button_container_->GetMinimumSize().width();
+         caption_button_container_->GetMinimumSize().width();
 }
 
 void DefaultHeaderPainter::PaintHeader(gfx::Canvas* canvas, Mode mode) {
@@ -132,8 +135,9 @@ void DefaultHeaderPainter::PaintHeader(gfx::Canvas* canvas, Mode mode) {
     initial_paint_ = false;
   }
 
-  int corner_radius = (frame_->IsMaximized() || frame_->IsFullscreen()) ?
-      0 : HeaderPainterUtil::GetTopCornerRadiusWhenRestored();
+  int corner_radius = (frame_->IsMaximized() || frame_->IsFullscreen())
+                          ? 0
+                          : HeaderPainterUtil::GetTopCornerRadiusWhenRestored();
 
   SkPaint paint;
   int active_alpha = activation_animation_->CurrentValueBetween(0, 255);
@@ -161,8 +165,7 @@ void DefaultHeaderPainter::LayoutHeader() {
   gfx::Size caption_button_container_size =
       caption_button_container_->GetPreferredSize();
   caption_button_container_->SetBounds(
-      view_->width() - caption_button_container_size.width(),
-      0,
+      view_->width() - caption_button_container_size.width(), 0,
       caption_button_container_size.width(),
       caption_button_container_size.height());
 
@@ -220,46 +223,38 @@ void DefaultHeaderPainter::AnimationProgressed(
 void DefaultHeaderPainter::PaintHighlightForInactiveRestoredWindow(
     gfx::Canvas* canvas) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia top_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_TOP);
-  gfx::ImageSkia left_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_LEFT);
-  gfx::ImageSkia right_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_RIGHT);
-  gfx::ImageSkia bottom_edge = *rb.GetImageSkiaNamed(
-      IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM);
+  gfx::ImageSkia top_edge =
+      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_TOP);
+  gfx::ImageSkia left_edge =
+      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_LEFT);
+  gfx::ImageSkia right_edge =
+      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_RIGHT);
+  gfx::ImageSkia bottom_edge =
+      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM);
 
   int left_edge_width = left_edge.width();
   int right_edge_width = right_edge.width();
   canvas->DrawImageInt(left_edge, 0, 0);
   canvas->DrawImageInt(right_edge, view_->width() - right_edge_width, 0);
-  canvas->TileImageInt(
-      top_edge,
-      left_edge_width,
-      0,
-      view_->width() - left_edge_width - right_edge_width,
-      top_edge.height());
+  canvas->TileImageInt(top_edge, left_edge_width, 0,
+                       view_->width() - left_edge_width - right_edge_width,
+                       top_edge.height());
 
   DCHECK_EQ(left_edge.height(), right_edge.height());
   int bottom = left_edge.height();
   int bottom_height = bottom_edge.height();
-  canvas->TileImageInt(
-      bottom_edge,
-      left_edge_width,
-      bottom - bottom_height,
-      view_->width() - left_edge_width - right_edge_width,
-      bottom_height);
+  canvas->TileImageInt(bottom_edge, left_edge_width, bottom - bottom_height,
+                       view_->width() - left_edge_width - right_edge_width,
+                       bottom_height);
 }
 
 void DefaultHeaderPainter::PaintTitleBar(gfx::Canvas* canvas) {
   // The window icon is painted by its own views::View.
   gfx::Rect title_bounds = GetTitleBounds();
   title_bounds.set_x(view_->GetMirroredXForRect(title_bounds));
-  canvas->DrawStringRectWithFlags(frame_->widget_delegate()->GetWindowTitle(),
-                                  GetTitleFontList(),
-                                  kTitleTextColor,
-                                  title_bounds,
-                                  gfx::Canvas::NO_SUBPIXEL_RENDERING);
+  canvas->DrawStringRectWithFlags(
+      frame_->widget_delegate()->GetWindowTitle(), GetTitleFontList(),
+      kTitleTextColor, title_bounds, gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 void DefaultHeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) {
@@ -267,8 +262,8 @@ void DefaultHeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) {
   const float scale = canvas->UndoDeviceScaleFactor();
   gfx::RectF rect(0, painted_height_ * scale - 1, view_->width() * scale, 1);
   SkPaint paint;
-  paint.setColor((mode_ == MODE_ACTIVE) ?
-      kHeaderContentSeparatorColor : kHeaderContentSeparatorInactiveColor);
+  paint.setColor((mode_ == MODE_ACTIVE) ? kHeaderContentSeparatorColor
+                                        : kHeaderContentSeparatorInactiveColor);
   canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), paint);
 }
 
@@ -278,10 +273,10 @@ void DefaultHeaderPainter::LayoutLeftHeaderView() {
     // container.
     // Floor when computing the center of |caption_button_container_|.
     gfx::Size size = left_header_view_->GetPreferredSize();
-    int icon_offset_y = caption_button_container_->height() / 2 -
-                        size.height() / 2;
-    left_header_view_->SetBounds(
-        left_view_x_inset_, icon_offset_y, size.width(), size.height());
+    int icon_offset_y =
+        caption_button_container_->height() / 2 - size.height() / 2;
+    left_header_view_->SetBounds(left_view_x_inset_, icon_offset_y,
+                                 size.width(), size.height());
   }
 }
 
@@ -295,49 +290,48 @@ void DefaultHeaderPainter::UpdateAllButtonImages() {
   bool use_light_images = ShouldUseLightImages();
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_MINIMIZE,
-      use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+      use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_MINIMIZE_WHITE
+                       : IDR_MASH_WM_WINDOW_CONTROL_ICON_MINIMIZE,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
 
   UpdateSizeButtonImages(use_light_images);
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_CLOSE,
-      use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_CLOSE,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+      use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_CLOSE_WHITE
+                       : IDR_MASH_WM_WINDOW_CONTROL_ICON_CLOSE,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-      use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+      use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_LEFT_SNAPPED_WHITE
+                       : IDR_MASH_WM_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-      use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED_WHITE
-                       : IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+      use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_RIGHT_SNAPPED_WHITE
+                       : IDR_MASH_WM_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
 }
 
 void DefaultHeaderPainter::UpdateSizeButtonImages(bool use_light_images) {
   int icon_id = 0;
   if (frame_->IsMaximized() || frame_->IsFullscreen()) {
-    icon_id = use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_RESTORE_WHITE
-                               : IDR_AURA_WINDOW_CONTROL_ICON_RESTORE;
+    icon_id = use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_RESTORE_WHITE
+                               : IDR_MASH_WM_WINDOW_CONTROL_ICON_RESTORE;
   } else {
-    icon_id = use_light_images ? IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE_WHITE
-                               : IDR_AURA_WINDOW_CONTROL_ICON_MAXIMIZE;
+    icon_id = use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_MAXIMIZE_WHITE
+                               : IDR_MASH_WM_WINDOW_CONTROL_ICON_MAXIMIZE;
   }
   caption_button_container_->SetButtonImages(
-      CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE,
-      icon_id,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_AURA_WINDOW_CONTROL_BACKGROUND_P);
+      CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE, icon_id,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
 }
 
 gfx::Rect DefaultHeaderPainter::GetLocalBounds() const {
@@ -354,4 +348,5 @@ bool DefaultHeaderPainter::UsesCustomFrameColors() const {
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
-}  // namespace ash
+}  // namespace wm
+}  // namespace mash