Moves mash/wm into ash/mus

ash/mus/shadow.cc

Index: ash/mus/shadow.cc
diff --git a/mash/wm/shadow.cc b/ash/mus/shadow.cc
similarity index 92%
rename from mash/wm/shadow.cc
rename to ash/mus/shadow.cc
index b18873487f750467a20594ec41e88d9b7be6607e..46861bff86f0f97dd8533a280ec2e820ba363f9a 100644
--- a/mash/wm/shadow.cc
+++ b/ash/mus/shadow.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/shadow.h"
+#include "ash/mus/shadow.h"
 
-#include "mash/wm/property_util.h"
+#include "ash/mus/property_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/resources/grit/ui_resources.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 namespace {
 
@@ -35,13 +35,13 @@ const int kSmallInteriorInset = 4;
 // Duration for opacity animation in milliseconds.
 const int kShadowAnimationDurationMs = 100;
 
-int GetShadowApertureForStyle(wm::Shadow::Style style) {
+int GetShadowApertureForStyle(mus::Shadow::Style style) {

[msw, 2016/06/02 20:28:34]

idle q: I wonder why this doesn't require the global :: prefix...

[sky, 2016/06/02 21:31:51]

Shadow is defined in ash/mus/shadow.h, in ash::mus::Shadow. So that mus:: here
isn't necessary at all. Updated.

   switch (style) {
-    case wm::Shadow::STYLE_ACTIVE:
+    case mus::Shadow::STYLE_ACTIVE:
       return kActiveInteriorAperture;
-    case wm::Shadow::STYLE_INACTIVE:
+    case mus::Shadow::STYLE_INACTIVE:
       return kInactiveInteriorAperture;
-    case wm::Shadow::STYLE_SMALL:
+    case mus::Shadow::STYLE_SMALL:
       return kSmallInteriorAperture;
   }
   return 0;
@@ -49,8 +49,7 @@ int GetShadowApertureForStyle(wm::Shadow::Style style) {
 
 }  // namespace
 
-Shadow::Shadow() : style_(STYLE_ACTIVE), interior_inset_(0), window_(nullptr) {
-}
+Shadow::Shadow() : style_(STYLE_ACTIVE), interior_inset_(0), window_(nullptr) {}
 
 Shadow::~Shadow() {
   if (window_) {
@@ -141,7 +140,7 @@ void Shadow::SetStyle(Style style) {
   }
 }
 
-void Shadow::Install(mus::Window* window) {
+void Shadow::Install(::mus::Window* window) {
   SetShadow(window, this);
   window_ = window;
   window_->AddObserver(this);
@@ -196,17 +195,16 @@ void Shadow::UpdateLayerBounds() {
   int aperture_x = std::min(aperture, layer_bounds.width() / 2);
   int aperture_y = std::min(aperture, layer_bounds.height() / 2);
   shadow_layer_->UpdateNinePatchLayerAperture(
-      gfx::Rect(aperture_x, aperture_y,
-                image_size_.width() - aperture_x * 2,
+      gfx::Rect(aperture_x, aperture_y, image_size_.width() - aperture_x * 2,
                 image_size_.height() - aperture_y * 2));
   shadow_layer_->UpdateNinePatchLayerBorder(
       gfx::Rect(aperture_x, aperture_y, aperture_x * 2, aperture_y * 2));
 }
 
-void Shadow::OnWindowDestroyed(mus::Window* window) {
+void Shadow::OnWindowDestroyed(::mus::Window* window) {
   DCHECK_EQ(window_, window);
   window_ = nullptr;
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash