[Cleanup] Rename WindowSettings to WindowState

ash/wm/window_properties.cc

Index: ash/wm/window_properties.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index 39291ccf408649e52d88b4e58895fc6a2126ac63..4df599a7cd8c1cfedfa9ef6cb6fe0d847f830754 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -4,8 +4,10 @@
 
 #include "ash/wm/window_properties.h"
 
+#include "ash/wm/window_state.h"
 #include "ui/aura/window_property.h"
-#include "ui/gfx/rect.h"
+
+DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*);
 
 namespace ash {
 namespace internal {
@@ -13,10 +15,7 @@ DEFINE_WINDOW_PROPERTY_KEY(bool, kAnimateToFullscreenKey, true);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kFullscreenUsesMinimalChromeKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
 DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
-DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect,
-                                 kPreAutoManagedWindowBoundsKey,
-                                 NULL);
-DEFINE_WINDOW_PROPERTY_KEY(bool, kWindowRestoresToRestoreBounds, false);
-
+DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState,
+                                 kWindowStateKey, NULL);
 }  // namespace internal
 }  // namespace ash