Move view property implmentation from NativeWidgetAura to window.

BUG=none
TEST=tbw


Review URL: http://codereview.chromium.org/8395039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107477 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 0 deletions

diff --git a/ui/aura/window.h b/ui/aura/window.h
index 8b236e2..a809f5d 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -6,6 +6,7 @@
 #define UI_AURA_WINDOW_H_
 #pragma once
 
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -27,6 +28,7 @@ class Animation;
 class Compositor;
 class Layer;
 class Transform;
+class ViewProp;
 }
 
 namespace aura {
@@ -256,6 +258,15 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
   // Returns true if this window is fullscreen or contains a fullscreen window.
   bool IsOrContainsFullscreenWindow() const;
 
+  // Sets the window property |value| for given |name|. Setting NULL
+  // removes the property. It uses |ui::ViewProp| to store the property.
+  // Please see the description of |prop_map_| for more details.
+  void SetProperty(const char* name, void* value);
+
+  // Returns the window property for given |name|.  Returns NULL if
+  // the property does not exist.
+  void* GetProperty(const char* name) const;
+
   // Returns an animation configured with the default duration. All animations
   // should use this. Caller owns returned value.
   static ui::Animation* CreateDefaultAnimation();
@@ -338,6 +349,13 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
 
   ObserverList<WindowObserver> observers_;
 
+  // We're using ViewProp to store the property (for now) instead of
+  // just using std::map because chrome is still using |ViewProp| class
+  // to create and access property.
+  // TODO(oshima): Consolidcate ViewProp and aura::window property
+  // implementation.
+  std::map<const char*, ui::ViewProp*> prop_map_;
+
   DISALLOW_COPY_AND_ASSIGN(Window);
 };