Eliminate linker warnings

- Don't use window_property.h in header. It'll generate duplicated symbols
- Define and export property type for bool and 
 ui::WindowShowState in ash as they're also used by
 properties defined in ash.

BUG=144155
TEST=no warning

Review URL: https://chromiumcodereview.appspot.com/11313022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164946 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 4 insertions, 4 deletions

diff --git a/ash/desktop_background/desktop_background_widget_controller.cc b/ash/desktop_background/desktop_background_widget_controller.cc
index f91ee3a..530dc0e 100644
--- a/ash/desktop_background/desktop_background_widget_controller.cc
+++ b/ash/desktop_background/desktop_background_widget_controller.cc
@@ -6,6 +6,7 @@
 
 #include "ash/ash_export.h"
 #include "ui/aura/root_window.h"
+#include "ui/aura/window_property.h"
 #include "ui/views/widget/widget.h"
 
 // Exported for tests.
diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h
index 272b3ce..27defa9 100644
--- a/ash/desktop_background/desktop_background_widget_controller.h
+++ b/ash/desktop_background/desktop_background_widget_controller.h
@@ -7,7 +7,7 @@
 
 #include "ash/ash_export.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/window_property.h"
+#include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 9760163..eccee50 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -41,6 +41,7 @@ DECLARE_WINDOW_PROPERTY_TYPE(int)
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowVisibilityAnimationType)
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowVisibilityAnimationTransition)
 DECLARE_WINDOW_PROPERTY_TYPE(float)
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, bool)
 
 using aura::Window;
 using base::TimeDelta;
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index 6aad28a..24e0ef4 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -11,8 +11,6 @@
 #include "ui/aura/window_property.h"
 #include "ui/ui_controls/ui_controls_aura.h"
 
-// Property type for bool and ui::WindowShowState are
-// defined in aura.
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*);
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType);
 DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*);
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 8677359..c7b0eff 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -9,7 +9,6 @@
 #include "ash/wm/property_util.h"
 #include "ash/wm/shadow_types.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_property.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ui_controls {
diff --git a/ash/wm/workspace/workspace_manager2.cc b/ash/wm/workspace/workspace_manager2.cc
index 68250c3..609fc79 100644
--- a/ash/wm/workspace/workspace_manager2.cc
+++ b/ash/wm/workspace/workspace_manager2.cc
@@ -36,6 +36,7 @@
 #include "ui/views/widget/widget.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::Workspace2*);
+DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ui::WindowShowState);
 
 using aura::Window;