| 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/aura/client/tooltip_client.h" | 5 #include "ui/aura/client/tooltip_client.h" |
| 6 | 6 |
| 7 #include "ui/aura/root_window.h" | 7 #include "ui/aura/window_event_dispatcher.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 | 12 |
| 13 namespace aura { | 13 namespace aura { |
| 14 namespace client { | 14 namespace client { |
| 15 | 15 |
| 16 DEFINE_LOCAL_WINDOW_PROPERTY_KEY( | 16 DEFINE_LOCAL_WINDOW_PROPERTY_KEY( |
| 17 TooltipClient*, kRootWindowTooltipClientKey, NULL); | 17 TooltipClient*, kRootWindowTooltipClientKey, NULL); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 33 window->SetProperty(kTooltipTextKey, tooltip_text); | 33 window->SetProperty(kTooltipTextKey, tooltip_text); |
| 34 } | 34 } |
| 35 | 35 |
| 36 const base::string16 GetTooltipText(Window* window) { | 36 const base::string16 GetTooltipText(Window* window) { |
| 37 base::string16* string_ptr = window->GetProperty(kTooltipTextKey); | 37 base::string16* string_ptr = window->GetProperty(kTooltipTextKey); |
| 38 return string_ptr ? *string_ptr : base::string16(); | 38 return string_ptr ? *string_ptr : base::string16(); |
| 39 } | 39 } |
| 40 | 40 |
| 41 } // namespace client | 41 } // namespace client |
| 42 } // namespace aura | 42 } // namespace aura |
| OLD | NEW |