Refactor and push window properties up to class properties.

ash/root_window_settings.cc

Index: ash/root_window_settings.cc
diff --git a/ash/root_window_settings.cc b/ash/root_window_settings.cc
index a0fd29d1b965460cf21937ea11adde3d4aeca89f..050b1cdbb16344554061e681f0bf3bf306c96fa4 100644
--- a/ash/root_window_settings.cc
+++ b/ash/root_window_settings.cc
@@ -4,17 +4,18 @@
 
 #include "ash/root_window_settings.h"
 
+#include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/aura/window_property.h"
+#include "ui/base/class_property.h"
 #include "ui/display/types/display_constants.h"
 
-DECLARE_WINDOW_PROPERTY_TYPE(ash::RootWindowSettings*);
+DECLARE_UI_CLASS_PROPERTY_TYPE(ash::RootWindowSettings*);
 
 namespace ash {
 
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(RootWindowSettings,
-                                 kRootWindowSettingsKey,
-                                 NULL);
+DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(RootWindowSettings,
+                                   kRootWindowSettingsKey,
+                                   NULL);
 
 RootWindowSettings::RootWindowSettings()
     : display_id(display::kInvalidDisplayId), controller(NULL) {}