Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/wm/public/tooltip_client.h" | 5 #include "ui/wm/public/tooltip_client.h" |
| 6 | 6 |
| 7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
| 8 #include "ui/aura/window_property.h" | 8 #include "ui/aura/window_property.h" |
| 9 | 9 |
| 10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*) | 10 DECLARE_WINDOW_PROPERTY_TYPE(aura::client::TooltipClient*) |
| 11 DECLARE_WINDOW_PROPERTY_TYPE(base::string16*) | 11 DECLARE_WINDOW_PROPERTY_TYPE(base::string16*) |
| 12 DECLARE_WINDOW_PROPERTY_TYPE(void*) | |
| 12 | 13 |
| 13 namespace aura { | 14 namespace aura { |
| 14 namespace client { | 15 namespace client { |
| 15 | 16 |
| 16 DEFINE_LOCAL_WINDOW_PROPERTY_KEY( | 17 DEFINE_LOCAL_WINDOW_PROPERTY_KEY( |
| 17 TooltipClient*, kRootWindowTooltipClientKey, NULL); | 18 TooltipClient*, kRootWindowTooltipClientKey, NULL); |
| 18 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL); | 19 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL); |
| 20 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(void**, kTooltipUniqueKey, NULL); | |
| 19 | 21 |
| 20 void SetTooltipClient(Window* root_window, TooltipClient* client) { | 22 void SetTooltipClient(Window* root_window, TooltipClient* client) { |
| 21 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 23 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
| 22 root_window->SetProperty(kRootWindowTooltipClientKey, client); | 24 root_window->SetProperty(kRootWindowTooltipClientKey, client); |
| 23 } | 25 } |
| 24 | 26 |
| 25 TooltipClient* GetTooltipClient(Window* root_window) { | 27 TooltipClient* GetTooltipClient(Window* root_window) { |
| 26 if (root_window) | 28 if (root_window) |
| 27 DCHECK_EQ(root_window->GetRootWindow(), root_window); | 29 DCHECK_EQ(root_window->GetRootWindow(), root_window); |
| 28 return root_window ? | 30 return root_window ? |
| 29 root_window->GetProperty(kRootWindowTooltipClientKey) : NULL; | 31 root_window->GetProperty(kRootWindowTooltipClientKey) : NULL; |
| 30 } | 32 } |
| 31 | 33 |
| 32 void SetTooltipText(Window* window, base::string16* tooltip_text) { | 34 void SetTooltipText(Window* window, |
| 35 base::string16* tooltip_text, | |
| 36 void** unique) { | |
| 33 window->SetProperty(kTooltipTextKey, tooltip_text); | 37 window->SetProperty(kTooltipTextKey, tooltip_text); |
| 38 window->SetProperty(kTooltipUniqueKey, unique); | |
| 34 } | 39 } |
| 35 | 40 |
| 36 const base::string16 GetTooltipText(Window* window) { | 41 const base::string16 GetTooltipText(Window* window) { |
| 37 base::string16* string_ptr = window->GetProperty(kTooltipTextKey); | 42 base::string16* string_ptr = window->GetProperty(kTooltipTextKey); |
| 38 return string_ptr ? *string_ptr : base::string16(); | 43 return string_ptr ? *string_ptr : base::string16(); |
| 39 } | 44 } |
| 40 | 45 |
| 46 const void* GetTooltipUnique(Window* window) { | |
| 47 void** ptr = window->GetProperty(kTooltipUniqueKey); | |
|
sky
2014/04/23 20:08:46
Seems like this implementation should be:
return w
Mikus
2014/04/24 08:39:56
Not really. It doesn't work in that case since we
| |
| 48 return ptr ? *ptr : NULL; | |
| 49 } | |
| 50 | |
| 41 } // namespace client | 51 } // namespace client |
| 42 } // namespace aura | 52 } // namespace aura |
| OLD | NEW |