Moves mash/wm into ash/mus

ash/mus/frame/default_header_painter.cc

 // 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 "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"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_canvas.h"
@@ skipping 42 matching lines @@
 // Returns the FontList to use for the title.
 const gfx::FontList& GetTitleFontList() {
   static const gfx::FontList* title_font_list =
       new gfx::FontList(views::NativeWidgetAura::GetWindowTitleFontList());
   ANNOTATE_LEAKING_OBJECT_PTR(title_font_list);
   return *title_font_list;
 }
 
 }  // namespace
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, public:
 
 DefaultHeaderPainter::DefaultHeaderPainter()
     : frame_(NULL),
       view_(NULL),
       left_header_view_(NULL),
       active_frame_color_(kDefaultFrameColor),
       inactive_frame_color_(kDefaultFrameColor),
@@ skipping 130 matching lines @@
   view_->SchedulePaintInRect(GetLocalBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DefaultHeaderPainter, private:
 
 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();
   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());
 
   DCHECK_EQ(left_edge.height(), right_edge.height());
@@ skipping 17 matching lines @@
   gfx::ScopedCanvas scoped_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);
   canvas->sk_canvas()->drawRect(gfx::RectFToSkRect(rect), paint);
 }
 
 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 {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect DefaultHeaderPainter::GetTitleBounds() const {
   return HeaderPainterUtil::GetTitleBounds(
       left_header_view_, caption_button_container_, GetTitleFontList());
 }
 
 bool DefaultHeaderPainter::UsesCustomFrameColors() const {
   return active_frame_color_ != kDefaultFrameColor ||
          inactive_frame_color_ != kDefaultFrameColor;
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash