| Index: ui/wm/core/window_animations.cc
|
| diff --git a/ui/wm/core/window_animations.cc b/ui/wm/core/window_animations.cc
|
| index feccce36c3a3ebb5a0f258bd29866c949b16ca2f..3b091888d6f38e24e6f3bcd180480caf2ea739f0 100644
|
| --- a/ui/wm/core/window_animations.cc
|
| +++ b/ui/wm/core/window_animations.cc
|
| @@ -37,8 +37,8 @@
|
| #include "ui/wm/core/wm_core_switches.h"
|
|
|
| DECLARE_WINDOW_PROPERTY_TYPE(int)
|
| -DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationType)
|
| -DECLARE_WINDOW_PROPERTY_TYPE(views::corewm::WindowVisibilityAnimationTransition)
|
| +DECLARE_WINDOW_PROPERTY_TYPE(wm::WindowVisibilityAnimationType)
|
| +DECLARE_WINDOW_PROPERTY_TYPE(wm::WindowVisibilityAnimationTransition)
|
| DECLARE_WINDOW_PROPERTY_TYPE(float)
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(WM_CORE_EXPORT, bool)
|
|
|
| @@ -46,8 +46,7 @@ using aura::Window;
|
| using base::TimeDelta;
|
| using ui::Layer;
|
|
|
| -namespace views {
|
| -namespace corewm {
|
| +namespace wm {
|
| namespace {
|
| const float kWindowAnimation_Vertical_TranslateY = 15.f;
|
| } // namespace
|
| @@ -554,5 +553,4 @@ bool WindowAnimationsDisabled(aura::Window* window) {
|
| switches::kWindowAnimationsDisabled));
|
| }
|
|
|
| -} // namespace corewm
|
| -} // namespace views
|
| +} // namespace wm
|
|
|