diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 00:07:53 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-27 00:07:53 +0000 |
| commit | 1e55cc910f25c8af743d5941ccdffd836bdf1de6 (patch) | |
| tree | c1b5ad6e7026abcf88998619ed48d93c5a7a1cfa /ui/aura/window.cc | |
| parent | d5c14067f0153540b6f6f0f7a807b5f77b6877d6 (diff) | |
| download | chromium_src-1e55cc910f25c8af743d5941ccdffd836bdf1de6.zip chromium_src-1e55cc910f25c8af743d5941ccdffd836bdf1de6.tar.gz chromium_src-1e55cc910f25c8af743d5941ccdffd836bdf1de6.tar.bz2 | |
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
Diffstat (limited to 'ui/aura/window.cc')
| -rw-r--r-- | ui/aura/window.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ui/aura/window.cc b/ui/aura/window.cc index 409454c..4a0fb35 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -17,6 +17,7 @@ #include "ui/aura/window_observer.h" #include "ui/aura/window_types.h" #include "ui/base/animation/multi_animation.h" +#include "ui/base/view_prop.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/compositor/compositor.h" #include "ui/gfx/compositor/layer.h" @@ -70,6 +71,8 @@ Window::~Window() { parent_->RemoveChild(this); FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowDestroyed(this)); + + STLDeleteValues(&prop_map_); } void Window::Init(ui::Layer::LayerType layer_type) { @@ -421,6 +424,19 @@ bool Window::IsOrContainsFullscreenWindow() const { return false; } +void Window::SetProperty(const char* name, void* value) { + ui::ViewProp* prop = prop_map_[name]; + delete prop; + if (value) + prop_map_[name] = new ui::ViewProp(this, name, value); + else + prop_map_.erase(name); +} + +void* Window::GetProperty(const char* name) const { + return ui::ViewProp::GetValue(const_cast<gfx::NativeView>(this), name); +} + // static ui::Animation* Window::CreateDefaultAnimation() { std::vector<ui::MultiAnimation::Part> parts; |