Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3004)

Unified Diff: ash/mus/frame/caption_buttons/frame_caption_button.h

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/mus/frame/caption_buttons/frame_caption_button.h
diff --git a/mash/wm/frame/caption_buttons/frame_caption_button.h b/ash/mus/frame/caption_buttons/frame_caption_button.h
similarity index 89%
rename from mash/wm/frame/caption_buttons/frame_caption_button.h
rename to ash/mus/frame/caption_buttons/frame_caption_button.h
index 9f816072431771c7a2e92a99d0ca0a7f36478ae7..8c3bff176b48dfb99140bf506d0d5875c057b02e 100644
--- a/mash/wm/frame/caption_buttons/frame_caption_button.h
+++ b/ash/mus/frame/caption_buttons/frame_caption_button.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_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
-#define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#ifndef ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#define ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#include <memory>
+#include "ash/mus/frame/caption_buttons/caption_button_types.h"
#include "base/macros.h"
-#include "mash/wm/frame/caption_buttons/caption_button_types.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/controls/button/custom_button.h"
@@ -16,8 +16,8 @@ namespace gfx {
class SlideAnimation;
}
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
// Base class for the window caption buttons (minimize, maximize, restore,
// close).
@@ -97,7 +97,7 @@ class FrameCaptionButton : public views::CustomButton {
DISALLOW_COPY_AND_ASSIGN(FrameCaptionButton);
};
-} // namespace wm
-} // namespace mash
+} // namespace mus
+} // namespace ash
-#endif // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#endif // ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
« no previous file with comments | « ash/mus/frame/caption_buttons/caption_button_types.h ('k') | ash/mus/frame/caption_buttons/frame_caption_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698