| Index: ash/mus/shadow.h
|
| diff --git a/ash/mus/shadow.h b/ash/mus/shadow.h
|
| index d7eae9b2fa11fa32cbf0c9736806cacd05e78853..9e499900839c5b9f6eef2c6f8ff42fa7c28b2749 100644
|
| --- a/ash/mus/shadow.h
|
| +++ b/ash/mus/shadow.h
|
| @@ -20,8 +20,7 @@ namespace ash {
|
| namespace mus {
|
|
|
| // Simple class that draws a drop shadow around content at given bounds.
|
| -class Shadow : public ui::ImplicitAnimationObserver,
|
| - public ::ui::WindowObserver {
|
| +class Shadow : public ui::ImplicitAnimationObserver, public ui::WindowObserver {
|
| public:
|
| enum Style {
|
| // Active windows have more opaque shadows, shifted down to make the window
|
| @@ -63,7 +62,7 @@ class Shadow : public ui::ImplicitAnimationObserver,
|
| void SetStyle(Style style);
|
|
|
| // Installs this shadow for |window|.
|
| - void Install(::ui::Window* window);
|
| + void Install(ui::Window* window);
|
|
|
| // ui::ImplicitAnimationObserver overrides:
|
| void OnImplicitAnimationsCompleted() override;
|
| @@ -77,7 +76,7 @@ class Shadow : public ui::ImplicitAnimationObserver,
|
| void UpdateLayerBounds();
|
|
|
| // WindowObserver:
|
| - void OnWindowDestroyed(::ui::Window* window) override;
|
| + void OnWindowDestroyed(ui::Window* window) override;
|
|
|
| // The current style, set when the transition animation starts.
|
| Style style_;
|
| @@ -99,7 +98,7 @@ class Shadow : public ui::ImplicitAnimationObserver,
|
| // grid should be set to |content_bounds_| inset by this amount.
|
| int interior_inset_;
|
|
|
| - ::ui::Window* window_;
|
| + ui::Window* window_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Shadow);
|
| };
|
|
|