Refactor and push window properties up to class properties.

ash/display/root_window_transformers.cc

 // Copyright (c) 2013 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 "ash/display/root_window_transformers.h"
 
 #include <cmath>
 
 #include "ash/common/ash_switches.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "third_party/skia/include/core/SkMatrix44.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(display::Display::Rotation);
+DECLARE_UI_CLASS_PROPERTY_TYPE(display::Display::Rotation);
 
 namespace ash {
 namespace {
 
 #if defined(OS_WIN)
-DEFINE_WINDOW_PROPERTY_KEY(display::Display::Rotation,
-                           kRotationPropertyKey,
-                           display::Display::ROTATE_0);
+DEFINE_UI_CLASS_PROPERTY_KEY(display::Display::Rotation,
+                             kRotationPropertyKey,
+                             display::Display::ROTATE_0);
 #endif
 
 // Round near zero value to zero.
 void RoundNearZero(gfx::Transform* transform) {
   const float kEpsilon = 0.001f;
   SkMatrix44& matrix = transform->matrix();
   for (int x = 0; x < 4; ++x) {
     for (int y = 0; y < 4; ++y) {
       if (std::abs(SkMScalarToFloat(matrix.get(x, y))) < kEpsilon)
         matrix.set(x, y, SkFloatToMScalar(0.0f));
@@ skipping 280 matching lines @@
                                          mirror_display_info);
 }
 
 RootWindowTransformer* CreateRootWindowTransformerForUnifiedDesktop(
     const gfx::Rect& screen_bounds,
     const display::Display& display) {
   return new PartialBoundsRootWindowTransformer(screen_bounds, display);
 }
 
 }  // namespace ash