| Index: ui/wm/public/tooltip_client.cc
|
| diff --git a/ui/wm/public/tooltip_client.cc b/ui/wm/public/tooltip_client.cc
|
| index 5dd446c25e3dd510819eab0cc5199dc287d93005..c9fd6f894de9311bf5eca699a05e8f1953ed7172 100644
|
| --- a/ui/wm/public/tooltip_client.cc
|
| +++ b/ui/wm/public/tooltip_client.cc
|
| @@ -4,19 +4,17 @@
|
|
|
| #include "ui/wm/public/tooltip_client.h"
|
|
|
| -#include "ui/aura/window.h"
|
| #include "ui/aura/window_property.h"
|
|
|
| -DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*)
|
| -DECLARE_WINDOW_PROPERTY_TYPE(void**)
|
| +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, aura::client::TooltipClient*)
|
| +DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(AURA_EXPORT, void**)
|
|
|
| namespace aura {
|
| namespace client {
|
|
|
| -DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
|
| - TooltipClient*, kRootWindowTooltipClientKey, NULL);
|
| -DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
|
| -DEFINE_LOCAL_WINDOW_PROPERTY_KEY(void*, kTooltipIdKey, NULL);
|
| +DEFINE_WINDOW_PROPERTY_KEY(TooltipClient*, kRootWindowTooltipClientKey, NULL);
|
| +DEFINE_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
|
| +DEFINE_WINDOW_PROPERTY_KEY(void*, kTooltipIdKey, NULL);
|
|
|
| void SetTooltipClient(Window* root_window, TooltipClient* client) {
|
| DCHECK_EQ(root_window->GetRootWindow(), root_window);
|
|
|