| Index: ui/aura/window.h
|
| diff --git a/ui/aura/window.h b/ui/aura/window.h
|
| index 33b4ae5f76e2921dcdafc4e086332d60bc209511..8e53aadec73c699a092c3e105b1b85899f46a15e 100644
|
| --- a/ui/aura/window.h
|
| +++ b/ui/aura/window.h
|
| @@ -31,7 +31,6 @@ class Compositor;
|
| class Layer;
|
| class LayerAnimationSequence;
|
| class Transform;
|
| -class ViewProp;
|
| }
|
|
|
| namespace aura {
|
| @@ -360,7 +359,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
|
| // to create and access property.
|
| // TODO(oshima): Consolidcate ViewProp and aura::window property
|
| // implementation.
|
| - std::map<const char*, ui::ViewProp*> prop_map_;
|
| + std::map<const char*, void*> prop_map_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Window);
|
| };
|
|
|