Index: ui/aura/client/aura_constants.cc |
diff --git a/ui/aura/client/aura_constants.cc b/ui/aura/client/aura_constants.cc |
index 7ba9f874d2582e40c619bb0f345e1fecd178c7dc..82a19fda79f0933241b9f7c4d6edde7d95896c2a 100644 |
--- a/ui/aura/client/aura_constants.cc |
+++ b/ui/aura/client/aura_constants.cc |
@@ -6,12 +6,14 @@ |
#include "ui/aura/window_property.h" |
#include "ui/gfx/rect.h" |
+#include "ui/views/view.h" |
sky
2013/05/13 15:53:14
This would introduce a cycle between aura->views a
|
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool) |
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::ModalType) |
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, gfx::Rect*) |
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::InputMethod*) |
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, ui::WindowShowState) |
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, views::View*) |
namespace aura { |
namespace client { |
@@ -24,6 +26,7 @@ DEFINE_WINDOW_PROPERTY_KEY(bool, kCanMaximizeKey, false); |
DEFINE_WINDOW_PROPERTY_KEY(bool, kCanResizeKey, true); |
DEFINE_WINDOW_PROPERTY_KEY(bool, kConstrainedWindowKey, false); |
DEFINE_WINDOW_PROPERTY_KEY(bool, kDrawAttentionKey, false); |
+DEFINE_WINDOW_PROPERTY_KEY(views::View*, kHostViewKey, NULL); |
DEFINE_WINDOW_PROPERTY_KEY(ui::ModalType, kModalKey, ui::MODAL_TYPE_NONE); |
// gfx::Rect object for RestoreBoundsKey property is owned by the window |
// and will be freed automatically. |