Refactor and push window properties up to class properties.

ui/wm/core/window_animations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/wm/core/window_animations.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/compositor/compositor_observer.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/core/wm_core_switches.h"
 #include "ui/wm/public/animation_host.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(wm::WindowVisibilityAnimationType)
-DECLARE_WINDOW_PROPERTY_TYPE(wm::WindowVisibilityAnimationTransition)
-DECLARE_WINDOW_PROPERTY_TYPE(float)
+DECLARE_CLASS_PROPERTY_TYPE(::wm::WindowVisibilityAnimationType)
+DECLARE_CLASS_PROPERTY_TYPE(::wm::WindowVisibilityAnimationTransition)
+DECLARE_CLASS_PROPERTY_TYPE(float)
 
 namespace wm {
 namespace {
 const float kWindowAnimation_Vertical_TranslateY = 15.f;
 
 // A base class for hiding animation observer which has two roles:
 // 1) Notifies AnimationHost at the end of hiding animation.
 // 2) Detaches the window's layers for hiding animation and deletes
 // them upon completion of the animation. This is necessary to a)
 // ensure that the animation continues in the event of the window being
@@ skipping 84 matching lines @@
   aura::Window* window_;
 
   // The owner of detached layers.
   std::unique_ptr<ui::LayerTreeOwner> layer_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(HidingWindowAnimationObserverBase);
 };
 
 }  // namespace
 
-DEFINE_WINDOW_PROPERTY_KEY(int,
-                           kWindowVisibilityAnimationTypeKey,
-                           WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT);
-DEFINE_WINDOW_PROPERTY_KEY(int, kWindowVisibilityAnimationDurationKey, 0);
-DEFINE_WINDOW_PROPERTY_KEY(WindowVisibilityAnimationTransition,
-                           kWindowVisibilityAnimationTransitionKey,
-                           ANIMATE_BOTH);
-DEFINE_WINDOW_PROPERTY_KEY(float,
-                           kWindowVisibilityAnimationVerticalPositionKey,
-                           kWindowAnimation_Vertical_TranslateY);
+DEFINE_CLASS_PROPERTY_KEY(int,
+                          kWindowVisibilityAnimationTypeKey,
+                          WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT);
+DEFINE_CLASS_PROPERTY_KEY(int, kWindowVisibilityAnimationDurationKey, 0);
+DEFINE_CLASS_PROPERTY_KEY(WindowVisibilityAnimationTransition,
+                          kWindowVisibilityAnimationTransitionKey,
+                          ANIMATE_BOTH);
+DEFINE_CLASS_PROPERTY_KEY(float,
+                          kWindowVisibilityAnimationVerticalPositionKey,
+                          kWindowAnimation_Vertical_TranslateY);
 
 // A HidingWindowAnimationObserver that deletes observer and detached
 // layers upon the completion of the implicit animation.
 class ImplicitHidingWindowAnimationObserver
     : public HidingWindowAnimationObserverBase,
       public ui::ImplicitAnimationObserver {
  public:
   ImplicitHidingWindowAnimationObserver(
       aura::Window* window,
       ui::ScopedLayerAnimationSettings* settings);
@@ skipping 495 matching lines @@
   // being accessed via Remote Desktop.
   if (ui::ScopedAnimationDurationScaleMode::duration_scale_mode() ==
       ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION)
     return false;
 
   // Let the user decide whether or not to play the animation.
   return !gfx::Animation::ShouldRenderRichAnimation();
 }
 
 }  // namespace wm