Use template specialization to generate WindowProperty code

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index c92dab107af5fbd9ebabe8818e9c68aa3c116856..f681acf830ab14893b414f6c6a9b8800eccdadf0 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -12,7 +12,6 @@
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
-#include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_switches_util.h"
@@ -36,6 +35,7 @@
 #include "ui/views/widget/desktop_aura/desktop_event_client.h"
 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
+#include "ui/views/widget/desktop_aura/desktop_native_widget_constants.h"

[sadrul, 2014/12/16 17:25:16]

Is this file missing too?

[oshima, 2014/12/16 21:09:12]

removed. my local build passed because the file was still there, sorry.

 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
 #include "ui/views/widget/drop_helper.h"
@@ -65,14 +65,7 @@
 #include "ui/gfx/win/dpi.h"
 #endif
 
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(VIEWS_EXPORT,
-                                      views::DesktopNativeWidgetAura*);
-
 namespace views {
-
-DEFINE_WINDOW_PROPERTY_KEY(DesktopNativeWidgetAura*,
-                           kDesktopNativeWidgetAuraKey, NULL);
-
 namespace {
 
 // This class provides functionality to create a top level widget to host a
@@ -273,12 +266,6 @@ DesktopNativeWidgetAura::~DesktopNativeWidgetAura() {
     CloseNow();
 }
 
-// static
-DesktopNativeWidgetAura* DesktopNativeWidgetAura::ForWindow(
-    aura::Window* window) {
-  return window->GetProperty(kDesktopNativeWidgetAuraKey);
-}
-
 void DesktopNativeWidgetAura::OnHostClosed() {
   // Don't invoke Widget::OnNativeWidgetDestroying(), its done by
   // DesktopWindowTreeHost.
@@ -422,7 +409,8 @@ void DesktopNativeWidgetAura::InitNativeWidget(
 
   host_->InitHost();
   host_->window()->AddChild(content_window_container_);
-  host_->window()->SetProperty(kDesktopNativeWidgetAuraKey, this);
+
+  SetForWindow(host_->window(), this);
 
   host_->window()->AddObserver(new RootWindowDestructionObserver(this));