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

Unified Diff: ash/mus/shadow.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
« no previous file with comments | « ash/mus/screenlock_layout.cc ('k') | ash/mus/shadow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/shadow.h
diff --git a/mash/wm/shadow.h b/ash/mus/shadow.h
similarity index 90%
rename from mash/wm/shadow.h
rename to ash/mus/shadow.h
index 9d3687bbd52200579fbfd54f72a7d8f9a317c7ef..b7d2124c65f5f118129701a1e30c960a4a16de20 100644
--- a/mash/wm/shadow.h
+++ b/ash/mus/shadow.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MASH_WM_SHADOW_H_
-#define MASH_WM_SHADOW_H_
+#ifndef ASH_MUS_SHADOW_H_
+#define ASH_MUS_SHADOW_H_
#include <memory>
@@ -16,12 +16,12 @@ namespace ui {
class Layer;
} // namespace ui
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
// Simple class that draws a drop shadow around content at given bounds.
class Shadow : public ui::ImplicitAnimationObserver,
- public mus::WindowObserver {
+ public ::mus::WindowObserver {
public:
enum Style {
// Active windows have more opaque shadows, shifted down to make the window
@@ -63,7 +63,7 @@ class Shadow : public ui::ImplicitAnimationObserver,
void SetStyle(Style style);
// Installs this shadow for |window|.
- void Install(mus::Window* window);
+ void Install(::mus::Window* window);
// ui::ImplicitAnimationObserver overrides:
void OnImplicitAnimationsCompleted() override;
@@ -77,7 +77,7 @@ class Shadow : public ui::ImplicitAnimationObserver,
void UpdateLayerBounds();
// WindowObserver:
- void OnWindowDestroyed(mus::Window* window) override;
+ void OnWindowDestroyed(::mus::Window* window) override;
// The current style, set when the transition animation starts.
Style style_;
@@ -99,12 +99,12 @@ class Shadow : public ui::ImplicitAnimationObserver,
// grid should be set to |content_bounds_| inset by this amount.
int interior_inset_;
- mus::Window* window_;
+ ::mus::Window* window_;
DISALLOW_COPY_AND_ASSIGN(Shadow);
};
-} // namespace wm
-} // namespace mash
+} // namespace mus
+} // namespace ash
-#endif // MASH_WM_SHADOW_H_
+#endif // ASH_MUS_SHADOW_H_
« no previous file with comments | « ash/mus/screenlock_layout.cc ('k') | ash/mus/shadow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698