| Index: ash/mus/frame/caption_buttons/caption_button_types.h
|
| diff --git a/mash/wm/frame/caption_buttons/caption_button_types.h b/ash/mus/frame/caption_buttons/caption_button_types.h
|
| similarity index 69%
|
| rename from mash/wm/frame/caption_buttons/caption_button_types.h
|
| rename to ash/mus/frame/caption_buttons/caption_button_types.h
|
| index 3bda201dc8691c143ae9e4273611cc2cc7fba7fe..b72588859bb5fc93a12810ac5a49860b55c8faa4 100644
|
| --- a/mash/wm/frame/caption_buttons/caption_button_types.h
|
| +++ b/ash/mus/frame/caption_buttons/caption_button_types.h
|
| @@ -2,11 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MASH_WM_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
|
| -#define MASH_WM_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
|
| +#ifndef ASH_MUS_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
|
| +#define ASH_MUS_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
|
|
|
| -namespace mash {
|
| -namespace wm {
|
| +namespace ash {
|
| +namespace mus {
|
|
|
| // These are the icon types that a caption button can have. The size button's
|
| // action (SnapType) can be different from its icon.
|
| @@ -21,7 +21,7 @@ enum CaptionButtonIcon {
|
| CAPTION_BUTTON_ICON_COUNT
|
| };
|
|
|
| -} // namespace wm
|
| -} // namespace mash
|
| +} // namespace mus
|
| +} // namespace ash
|
|
|
| -#endif // MASH_WM_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
|
| +#endif // ASH_MUS_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
|
|
|