Chromium Code Reviews| 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..32819a1b6dae88ac8216b771e6d17c01e55f56e1 100644 |
| --- a/ui/wm/public/tooltip_client.cc |
| +++ b/ui/wm/public/tooltip_client.cc |
| @@ -4,7 +4,6 @@ |
| #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*) |
|
sky
2017/01/12 20:15:18
I believe you'll want DECLARE_EXPORTED_WINDOW_PROP
chengx
2017/01/13 01:17:51
Fixed.
|
| @@ -13,10 +12,9 @@ DECLARE_WINDOW_PROPERTY_TYPE(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); |