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

Unified Diff: ash/mus/frame/default_header_painter.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/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_
« no previous file with comments | « ash/mus/frame/caption_buttons/frame_caption_button_container_view.cc ('k') | ash/mus/frame/default_header_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698