Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Side by Side Diff: ui/wm/public/tooltip_client.cc

Issue 2502413005: Use aura::WindowProperty for title and name strings. (Closed)
Patch Set: Update comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/widget/window_reorderer_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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*)
12 DECLARE_WINDOW_PROPERTY_TYPE(void**) 11 DECLARE_WINDOW_PROPERTY_TYPE(void**)
13 12
14 namespace aura { 13 namespace aura {
15 namespace client { 14 namespace client {
16 15
17 DEFINE_LOCAL_WINDOW_PROPERTY_KEY( 16 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(
18 TooltipClient*, kRootWindowTooltipClientKey, NULL); 17 TooltipClient*, kRootWindowTooltipClientKey, NULL);
19 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL); 18 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
20 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(void*, kTooltipIdKey, NULL); 19 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(void*, kTooltipIdKey, NULL);
21 20
(...skipping 21 matching lines...) Expand all
43 base::string16* string_ptr = window->GetProperty(kTooltipTextKey); 42 base::string16* string_ptr = window->GetProperty(kTooltipTextKey);
44 return string_ptr ? *string_ptr : base::string16(); 43 return string_ptr ? *string_ptr : base::string16();
45 } 44 }
46 45
47 const void* GetTooltipId(Window* window) { 46 const void* GetTooltipId(Window* window) {
48 return window->GetProperty(kTooltipIdKey); 47 return window->GetProperty(kTooltipIdKey);
49 } 48 }
50 49
51 } // namespace client 50 } // namespace client
52 } // namespace aura 51 } // namespace aura
OLDNEW
« no previous file with comments | « ui/views/widget/window_reorderer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698