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

Unified Diff: ui/aura/window.h

Issue 8428010: Cleanup: Remove ViewProp from aura build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments Created 9 years, 2 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
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698