Moves mash/wm into ash/mus

ash/mus/frame/default_header_painter.cc

Index: ash/mus/frame/default_header_painter.cc
diff --git a/mash/wm/frame/default_header_painter.cc b/ash/mus/frame/default_header_painter.cc
similarity index 84%
rename from mash/wm/frame/default_header_painter.cc
rename to ash/mus/frame/default_header_painter.cc
index dfc1ed14cef749860eb87cefa09f47ccfe046b2b..40c14e91b34ceea0d20cab67dfb31bbfc263de30 100644
--- a/mash/wm/frame/default_header_painter.cc
+++ b/ash/mus/frame/default_header_painter.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/frame/default_header_painter.h"
+#include "ash/mus/frame/default_header_painter.h"
 
+#include "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/mus/frame/header_painter_util.h"
 #include "base/debug/leak_annotations.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 "grit/ash_mus_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -71,8 +71,8 @@ const gfx::FontList& GetTitleFontList() {
 
 }  // namespace
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
@@ -223,13 +223,13 @@ void DefaultHeaderPainter::PaintHighlightForInactiveRestoredWindow(
     gfx::Canvas* canvas) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::ImageSkia top_edge =
-      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_TOP);
+      *rb.GetImageSkiaNamed(IDR_ASH_MUS_WINDOW_HEADER_SHADE_INACTIVE_TOP);
   gfx::ImageSkia left_edge =
-      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_LEFT);
+      *rb.GetImageSkiaNamed(IDR_ASH_MUS_WINDOW_HEADER_SHADE_INACTIVE_LEFT);
   gfx::ImageSkia right_edge =
-      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_RIGHT);
+      *rb.GetImageSkiaNamed(IDR_ASH_MUS_WINDOW_HEADER_SHADE_INACTIVE_RIGHT);
   gfx::ImageSkia bottom_edge =
-      *rb.GetImageSkiaNamed(IDR_MASH_WM_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM);
+      *rb.GetImageSkiaNamed(IDR_ASH_MUS_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM);
 
   int left_edge_width = left_edge.width();
   int right_edge_width = right_edge.width();
@@ -267,56 +267,56 @@ void DefaultHeaderPainter::PaintHeaderContentSeparator(gfx::Canvas* canvas) {
 }
 
 bool DefaultHeaderPainter::ShouldUseLightImages() {
-  return color_utils::IsDark(
-      mode_ == MODE_INACTIVE ? inactive_frame_color_ : active_frame_color_);
+  return color_utils::IsDark(mode_ == MODE_INACTIVE ? inactive_frame_color_
+                                                    : active_frame_color_);
 }
 
 void DefaultHeaderPainter::UpdateAllButtonImages() {
   bool use_light_images = ShouldUseLightImages();
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_MINIMIZE,
-      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);
+      use_light_images ? IDR_ASH_MUS_WINDOW_CONTROL_ICON_MINIMIZE_WHITE
+                       : IDR_ASH_MUS_WINDOW_CONTROL_ICON_MINIMIZE,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_P);
 
   UpdateSizeButtonImages(use_light_images);
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_CLOSE,
-      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);
+      use_light_images ? IDR_ASH_MUS_WINDOW_CONTROL_ICON_CLOSE_WHITE
+                       : IDR_ASH_MUS_WINDOW_CONTROL_ICON_CLOSE,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_P);
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_LEFT_SNAPPED,
-      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);
+      use_light_images ? IDR_ASH_MUS_WINDOW_CONTROL_ICON_LEFT_SNAPPED_WHITE
+                       : IDR_ASH_MUS_WINDOW_CONTROL_ICON_LEFT_SNAPPED,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_P);
 
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_RIGHT_SNAPPED,
-      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);
+      use_light_images ? IDR_ASH_MUS_WINDOW_CONTROL_ICON_RIGHT_SNAPPED_WHITE
+                       : IDR_ASH_MUS_WINDOW_CONTROL_ICON_RIGHT_SNAPPED,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_ASH_MUS_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_MASH_WM_WINDOW_CONTROL_ICON_RESTORE_WHITE
-                               : IDR_MASH_WM_WINDOW_CONTROL_ICON_RESTORE;
+    icon_id = use_light_images ? IDR_ASH_MUS_WINDOW_CONTROL_ICON_RESTORE_WHITE
+                               : IDR_ASH_MUS_WINDOW_CONTROL_ICON_RESTORE;
   } else {
-    icon_id = use_light_images ? IDR_MASH_WM_WINDOW_CONTROL_ICON_MAXIMIZE_WHITE
-                               : IDR_MASH_WM_WINDOW_CONTROL_ICON_MAXIMIZE;
+    icon_id = use_light_images ? IDR_ASH_MUS_WINDOW_CONTROL_ICON_MAXIMIZE_WHITE
+                               : IDR_ASH_MUS_WINDOW_CONTROL_ICON_MAXIMIZE;
   }
   caption_button_container_->SetButtonImages(
       CAPTION_BUTTON_ICON_MAXIMIZE_RESTORE, icon_id,
-      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_H,
-      IDR_MASH_WM_WINDOW_CONTROL_BACKGROUND_P);
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_H,
+      IDR_ASH_MUS_WINDOW_CONTROL_BACKGROUND_P);
 }
 
 gfx::Rect DefaultHeaderPainter::GetLocalBounds() const {
@@ -333,5 +333,5 @@ bool DefaultHeaderPainter::UsesCustomFrameColors() const {
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash