| Index: ash/mus/drag_window_resizer.h
|
| diff --git a/mash/wm/drag_window_resizer.h b/ash/mus/drag_window_resizer.h
|
| similarity index 65%
|
| rename from mash/wm/drag_window_resizer.h
|
| rename to ash/mus/drag_window_resizer.h
|
| index f662949df94431aa4c779d90054bf3a5fbbb3c9f..4d570871d151af07aa9d7bcc3bc7f22d7ec359f0 100644
|
| --- a/mash/wm/drag_window_resizer.h
|
| +++ b/ash/mus/drag_window_resizer.h
|
| @@ -2,23 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MASH_WM_DRAG_WINDOW_RESIZER_H_
|
| -#define MASH_WM_DRAG_WINDOW_RESIZER_H_
|
| +#ifndef ASH_MUS_DRAG_WINDOW_RESIZER_H_
|
| +#define ASH_MUS_DRAG_WINDOW_RESIZER_H_
|
|
|
| #include <memory>
|
|
|
| #include "ash/common/wm/window_resizer.h"
|
| #include "base/macros.h"
|
|
|
| -namespace mash {
|
| -namespace wm {
|
| +namespace ash {
|
| +namespace mus {
|
|
|
| // DragWindowResizer is a decorator of WindowResizer and adds the ability to
|
| // drag windows across displays.
|
| -class DragWindowResizer : public ash::WindowResizer {
|
| +class DragWindowResizer : public WindowResizer {
|
| public:
|
| DragWindowResizer(std::unique_ptr<WindowResizer> next_window_resizer,
|
| - ash::wm::WindowState* window_state);
|
| + wm::WindowState* window_state);
|
| ~DragWindowResizer() override;
|
|
|
| // WindowResizer:
|
| @@ -27,12 +27,12 @@ class DragWindowResizer : public ash::WindowResizer {
|
| void RevertDrag() override;
|
|
|
| private:
|
| - std::unique_ptr<ash::WindowResizer> next_window_resizer_;
|
| + std::unique_ptr<WindowResizer> next_window_resizer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DragWindowResizer);
|
| };
|
|
|
| -} // namespace wm
|
| -} // namespace mash
|
| +} // namespace mus
|
| +} // namespace ash
|
|
|
| -#endif // MASH_WM_DRAG_WINDOW_RESIZER_H_
|
| +#endif // ASH_MUS_DRAG_WINDOW_RESIZER_H_
|
|
|