summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-26 11:54:38 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-26 11:54:38 +0000
commite518df91cc480411ace37455b626983e50f71949 (patch)
tree53152452d7c34be22c9f9d6bac1d6f28c72772c5 /ui
parent25ae16e2002fa7b2da8803d0690c44c9c5d5d355 (diff)
downloadchromium_src-e518df91cc480411ace37455b626983e50f71949.zip
chromium_src-e518df91cc480411ace37455b626983e50f71949.tar.gz
chromium_src-e518df91cc480411ace37455b626983e50f71949.tar.bz2
Removes two properties that are defined else where. With these we get
link warnings. BUG=144155 TEST=none R=oshima@chromium.org Review URL: https://chromiumcodereview.appspot.com/10871076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/aura/client/activation_client.cc1
-rw-r--r--ui/views/widget/desktop_native_widget_helper_aura.cc2
2 files changed, 0 insertions, 3 deletions
diff --git a/ui/aura/client/activation_client.cc b/ui/aura/client/activation_client.cc
index 9348eb4..b557023 100644
--- a/ui/aura/client/activation_client.cc
+++ b/ui/aura/client/activation_client.cc
@@ -9,7 +9,6 @@
DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::Window*)
DECLARE_WINDOW_PROPERTY_TYPE(aura::client::ActivationClient*)
-DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, bool);
namespace aura {
namespace client {
diff --git a/ui/views/widget/desktop_native_widget_helper_aura.cc b/ui/views/widget/desktop_native_widget_helper_aura.cc
index 598b366..ed136d4 100644
--- a/ui/views/widget/desktop_native_widget_helper_aura.cc
+++ b/ui/views/widget/desktop_native_widget_helper_aura.cc
@@ -26,8 +26,6 @@
#include "ui/views/widget/x11_window_event_filter.h"
#endif
-DECLARE_WINDOW_PROPERTY_TYPE(aura::Window*);
-
namespace views {
DEFINE_WINDOW_PROPERTY_KEY(