| Index: ash/mus/frame/default_header_painter.h
|
| diff --git a/mash/wm/frame/default_header_painter.h b/ash/mus/frame/default_header_painter.h
|
| similarity index 92%
|
| rename from mash/wm/frame/default_header_painter.h
|
| rename to ash/mus/frame/default_header_painter.h
|
| index 61d2c6e9f72b86c50ac131c01b5d447610466212..dccd03cb27d777763ff9fce6a0ea10c7addd14ff 100644
|
| --- a/mash/wm/frame/default_header_painter.h
|
| +++ b/ash/mus/frame/default_header_painter.h
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
|
| -#define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
|
| +#ifndef ASH_MUS_FRAME_DEFAULT_HEADER_PAINTER_H_
|
| +#define ASH_MUS_FRAME_DEFAULT_HEADER_PAINTER_H_
|
|
|
| #include <memory>
|
|
|
| +#include "ash/mus/frame/header_painter.h"
|
| #include "base/macros.h"
|
| -#include "mash/wm/frame/header_painter.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| #include "ui/gfx/animation/animation_delegate.h"
|
|
|
| @@ -22,8 +22,8 @@ class View;
|
| class Widget;
|
| }
|
|
|
| -namespace mash {
|
| -namespace wm {
|
| +namespace ash {
|
| +namespace mus {
|
|
|
| class FrameCaptionButtonContainerView;
|
|
|
| @@ -111,7 +111,7 @@ class DefaultHeaderPainter : public HeaderPainter,
|
| DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
|
| };
|
|
|
| -} // namespace wm
|
| -} // namespace mash
|
| +} // namespace mus
|
| +} // namespace ash
|
|
|
| -#endif // MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
|
| +#endif // ASH_MUS_FRAME_DEFAULT_HEADER_PAINTER_H_
|
|
|