Index: ash/mus/frame/frame_border_hit_test_controller.cc |
diff --git a/mash/wm/frame/frame_border_hit_test_controller.cc b/ash/mus/frame/frame_border_hit_test_controller.cc |
similarity index 94% |
rename from mash/wm/frame/frame_border_hit_test_controller.cc |
rename to ash/mus/frame/frame_border_hit_test_controller.cc |
index 4ea847f8cbdd9d37527631c12d1ab1d3b4e26825..0beee5d31d85a944b9f0a942d95a5509ad76d8ce 100644 |
--- a/mash/wm/frame/frame_border_hit_test_controller.cc |
+++ b/ash/mus/frame/frame_border_hit_test_controller.cc |
@@ -2,9 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "mash/wm/frame/frame_border_hit_test_controller.h" |
+#include "ash/mus/frame/frame_border_hit_test_controller.h" |
-#include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h" |
+#include "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h" |
#include "ui/aura/env.h" |
#include "ui/aura/window.h" |
#include "ui/base/hit_test.h" |
@@ -13,8 +13,8 @@ |
#include "ui/views/widget/widget_delegate.h" |
#include "ui/views/window/non_client_view.h" |
-namespace mash { |
-namespace wm { |
+namespace ash { |
+namespace mus { |
// In the window corners, the resize areas don't actually expand bigger, but the |
// 16 px at the end of each edge triggers diagonal resizing. |
@@ -85,5 +85,5 @@ int FrameBorderHitTestController::NonClientHitTest( |
return HTCAPTION; |
} |
-} // namespace wm |
-} // namespace mash |
+} // namespace mus |
+} // namespace ash |