Moves mash/wm into ash/mus

ash/mus/frame/header_painter_util.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/header_painter_util.h"
+#include "ash/mus/frame/header_painter_util.h"
 
 #include <algorithm>
 
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
@@ skipping 15 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 mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // static
 int HeaderPainterUtil::GetTopCornerRadiusWhenRestored() {
   return kTopCornerRadiusWhenRestored;
 }
 
 // static
 int HeaderPainterUtil::GetLeftViewXInset() {
   return kLeftViewXInset;
 }
@@ skipping 16 matching lines @@
   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) {
   return true;
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash