5 files changed, 5 insertions, 7 deletions
diff --git a/athena/extensions/athena_constrained_window_views_client.cc b/athena/extensions/athena_constrained_window_views_client.cc
index 1645639..7a89d53 100644
--- a/athena/extensions/athena_constrained_window_views_client.cc
+++ b/athena/extensions/athena_constrained_window_views_client.cc
@@ -16,6 +16,8 @@
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 
+DECLARE_WINDOW_PROPERTY_TYPE(web_modal::ModalDialogHost*);
+
 namespace athena {
 namespace {
 
diff --git a/athena/screen/modal_window_controller.cc b/athena/screen/modal_window_controller.cc
index 140b2c9..63d82b6 100644
--- a/athena/screen/modal_window_controller.cc
+++ b/athena/screen/modal_window_controller.cc
@@ -13,6 +13,8 @@
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/wm/core/window_animations.h"
 
+DECLARE_WINDOW_PROPERTY_TYPE(athena::ModalWindowController*);
+
 namespace athena {
 namespace {
 
diff --git a/athena/screen/screen_manager_impl.cc b/athena/screen/screen_manager_impl.cc
index 8f960eb..dee725b 100644
--- a/athena/screen/screen_manager_impl.cc
+++ b/athena/screen/screen_manager_impl.cc
@@ -25,8 +25,7 @@
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/window_util.h"
 
-// This is to avoid creating type definitoin for kAlwaysOnTopKey.
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ATHENA_EXPORT, bool);
+DECLARE_WINDOW_PROPERTY_TYPE(athena::ScreenManager::ContainerParams*);
 
 namespace athena {
 namespace {
diff --git a/athena/util/fill_layout_manager.cc b/athena/util/fill_layout_manager.cc
index 2a3eb22..2fe7722 100644
--- a/athena/util/fill_layout_manager.cc
+++ b/athena/util/fill_layout_manager.cc
@@ -8,9 +8,6 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 
-// This is to avoid creating type definitoin for kAlwaysFillWindowKey.
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ATHENA_EXPORT, bool);
-
 namespace athena {
 namespace {
 
diff --git a/athena/wm/window_list_provider_impl.cc b/athena/wm/window_list_provider_impl.cc
index 6823a4d..eec4f8b 100644
--- a/athena/wm/window_list_provider_impl.cc
+++ b/athena/wm/window_list_provider_impl.cc
@@ -13,8 +13,6 @@
 #include "ui/wm/core/transient_window_manager.h"
 #include "ui/wm/core/window_util.h"
 
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ATHENA_EXPORT, bool);
-
 namespace athena {
 namespace {