Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: ui/aura/client/window_parenting_client.cc

Issue 2632543003: Refactor and push window properties up to class properties. (Closed)
Patch Set: More build fixes Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/aura/client/window_parenting_client.cc
diff --git a/ui/aura/client/window_parenting_client.cc b/ui/aura/client/window_parenting_client.cc
index 9d199b149db63bd14d2dc418114376a38b5c6aa6..d667a0263f16c95d73fd9305b8193e4dc20ea075 100644
--- a/ui/aura/client/window_parenting_client.cc
+++ b/ui/aura/client/window_parenting_client.cc
@@ -5,17 +5,18 @@
#include "ui/aura/client/window_parenting_client.h"
#include "ui/aura/env.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"
-DECLARE_WINDOW_PROPERTY_TYPE(aura::client::WindowParentingClient*)
+DECLARE_UI_CLASS_PROPERTY_TYPE(aura::client::WindowParentingClient*)
namespace aura {
namespace client {
-DEFINE_WINDOW_PROPERTY_KEY(WindowParentingClient*,
- kRootWindowWindowParentingClientKey,
- NULL);
+DEFINE_UI_CLASS_PROPERTY_KEY(WindowParentingClient*,
+ kRootWindowWindowParentingClientKey,
+ NULL);
void SetWindowParentingClient(Window* window,
WindowParentingClient* window_tree_client) {

Powered by Google App Engine
This is Rietveld 408576698