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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 2632543003: Refactor and push window properties up to class properties. (Closed)
Patch Set: 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/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index cfc4f0d6f8c37cf2da4e63a17ef5495930eb79f1..d40ade288b6dc577211e66211a5dc7c9f8d68f04 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -26,7 +26,7 @@
#include "ui/aura/client/focus_client.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/base/dragdrop/os_exchange_data_provider_aurax11.h"
#include "ui/base/hit_test.h"
#include "ui/base/ime/input_method.h"
@@ -64,7 +64,7 @@
#include "ui/wm/core/compound_event_filter.h"
#include "ui/wm/core/window_util.h"
-DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostX11*);
+DECLARE_CLASS_PROPERTY_TYPE(views::DesktopWindowTreeHostX11*);
namespace views {
@@ -72,10 +72,10 @@ DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture =
NULL;
std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL;
-DEFINE_WINDOW_PROPERTY_KEY(
+DEFINE_CLASS_PROPERTY_KEY(
aura::Window*, kViewsWindowForRootWindow, NULL);
-DEFINE_WINDOW_PROPERTY_KEY(
+DEFINE_CLASS_PROPERTY_KEY(
DesktopWindowTreeHostX11*, kHostForRootWindow, NULL);
namespace {

Powered by Google App Engine
This is Rietveld 408576698