| Index: ash/mus/frame/caption_buttons/frame_caption_button.cc
|
| diff --git a/mash/wm/frame/caption_buttons/frame_caption_button.cc b/ash/mus/frame/caption_buttons/frame_caption_button.cc
|
| similarity index 97%
|
| rename from mash/wm/frame/caption_buttons/frame_caption_button.cc
|
| rename to ash/mus/frame/caption_buttons/frame_caption_button.cc
|
| index 491829fe582a10609eeac4613b507e1db839b781..48eb47186bb6b1c0b6ac7bc4a755d0230bbea5c7 100644
|
| --- a/mash/wm/frame/caption_buttons/frame_caption_button.cc
|
| +++ b/ash/mus/frame/caption_buttons/frame_caption_button.cc
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mash/wm/frame/caption_buttons/frame_caption_button.h"
|
| +#include "ash/mus/frame/caption_buttons/frame_caption_button.h"
|
|
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/gfx/animation/slide_animation.h"
|
| #include "ui/gfx/animation/throb_animation.h"
|
| #include "ui/gfx/canvas.h"
|
|
|
| -namespace mash {
|
| -namespace wm {
|
| +namespace ash {
|
| +namespace mus {
|
|
|
| namespace {
|
|
|
| @@ -189,5 +189,5 @@ void FrameCaptionButton::PaintCentered(gfx::Canvas* canvas,
|
| (height() - to_center.height()) / 2, paint);
|
| }
|
|
|
| -} // namespace wm
|
| -} // namespace mash
|
| +} // namespace mus
|
| +} // namespace ash
|
|
|