2 files changed, 17 insertions, 1 deletions
diff --git a/ui/wm/public/tooltip_client.cc b/ui/wm/public/tooltip_client.cc
index b473238..844cca5 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);
@@ -33,10 +35,18 @@ void SetTooltipText(Window* window, base::string16* tooltip_text) {
   window->SetProperty(kTooltipTextKey, tooltip_text);
 }
 
+void SetTooltipId(Window* window, void* id) {
+  window->SetProperty(kTooltipIdKey, id);
+}
+
 const base::string16 GetTooltipText(Window* window) {
   base::string16* string_ptr = window->GetProperty(kTooltipTextKey);
   return string_ptr ? *string_ptr : base::string16();
 }
 
+const void* GetTooltipId(Window* window) {
+  return window->GetProperty(kTooltipIdKey);
+}
+
 }  // namespace client
 }  // namespace aura
diff --git a/ui/wm/public/tooltip_client.h b/ui/wm/public/tooltip_client.h
index f592b21..f2b97cd 100644
--- a/ui/wm/public/tooltip_client.h
+++ b/ui/wm/public/tooltip_client.h
@@ -36,8 +36,14 @@ AURA_EXPORT void SetTooltipClient(Window* root_window,
                                   TooltipClient* client);
 AURA_EXPORT TooltipClient* GetTooltipClient(Window* root_window);
 
-AURA_EXPORT void SetTooltipText(Window* window, base::string16* tooltip_text);
+// Sets the text for the tooltip. The id is used to determine uniqueness when
+// the text does not change. For example, if the tooltip text does not change,
+// but the id does then the position of the tooltip is updated.
+AURA_EXPORT void SetTooltipText(Window* window,
+                                base::string16* tooltip_text);
+AURA_EXPORT void SetTooltipId(Window* window, void* id);
 AURA_EXPORT const base::string16 GetTooltipText(Window* window);
+AURA_EXPORT const void* GetTooltipId(Window* window);
 
 }  // namespace client
 }  // namespace aura