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

Unified Diff: ash/mus/frame/caption_buttons/frame_caption_button_container_view.cc

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_container_view.cc
diff --git a/mash/wm/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/mus/frame/caption_buttons/frame_caption_button_container_view.cc
similarity index 98%
rename from mash/wm/frame/caption_buttons/frame_caption_button_container_view.cc
rename to ash/mus/frame/caption_buttons/frame_caption_button_container_view.cc
index dad7f1555771e0bf53639256b50601d040a26380..7f98c43e5adff3e0fd19e2774151b6c8d58ea3be 100644
--- a/mash/wm/frame/caption_buttons/frame_caption_button_container_view.cc
+++ b/ash/mus/frame/caption_buttons/frame_caption_button_container_view.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_container_view.h"
+#include "ash/mus/frame/caption_buttons/frame_caption_button_container_view.h"
#include <stddef.h>
#include <cmath>
#include <map>
+#include "ash/mus/frame/caption_buttons/frame_caption_button.h"
#include "base/macros.h"
-#include "mash/wm/frame/caption_buttons/frame_caption_button.h"
#include "ui/base/hit_test.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/animation/slide_animation.h"
@@ -22,8 +22,8 @@
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
namespace {
@@ -352,5 +352,5 @@ FrameCaptionButtonContainerView::ButtonIconIds::ButtonIconIds(
FrameCaptionButtonContainerView::ButtonIconIds::~ButtonIconIds() {}
-} // namespace wm
-} // namespace mash
+} // namespace mus
+} // namespace ash
« no previous file with comments | « ash/mus/frame/caption_buttons/frame_caption_button_container_view.h ('k') | ash/mus/frame/default_header_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698