Index: ui/wm/public/tooltip_client.cc |
diff --git a/ui/wm/public/tooltip_client.cc b/ui/wm/public/tooltip_client.cc |
index b47323880e956ac1fd57e9976e5fa7896ae2592e..23f4e73803ed63673cb9da60821fec036ae60775 100644 |
--- a/ui/wm/public/tooltip_client.cc |
+++ b/ui/wm/public/tooltip_client.cc |
@@ -9,6 +9,7 @@ |
DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*) |
DECLARE_WINDOW_PROPERTY_TYPE(base::string16*) |
+DECLARE_WINDOW_PROPERTY_TYPE(void**) |
namespace aura { |
namespace client { |
@@ -16,6 +17,7 @@ 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); |
void SetTooltipClient(Window* root_window, TooltipClient* client) { |
DCHECK_EQ(root_window->GetRootWindow(), root_window); |
@@ -31,6 +33,11 @@ TooltipClient* GetTooltipClient(Window* root_window) { |
void SetTooltipText(Window* window, base::string16* tooltip_text) { |
window->SetProperty(kTooltipTextKey, tooltip_text); |
+ window->SetProperty(kTooltipIdKey, static_cast<void*>(NULL)); |
sky
2014/06/02 15:39:47
Is this really necessary?
|
+} |
+ |
+void UpdateTooltipId(Window* window, void* id) { |
+ window->SetProperty(kTooltipIdKey, id); |
} |
const base::string16 GetTooltipText(Window* window) { |
@@ -38,5 +45,9 @@ const base::string16 GetTooltipText(Window* window) { |
return string_ptr ? *string_ptr : base::string16(); |
} |
+const void* GetTooltipId(Window* window) { |
+ return window->GetProperty(kTooltipIdKey); |
+} |
+ |
} // namespace client |
} // namespace aura |