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

Side by Side Diff: ui/aura/client/tooltip_client.cc

Issue 15759009: ui/aura: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 6 months 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 | Annotate | Revision Log
« no previous file with comments | « ui/aura/client/tooltip_client.h ('k') | ui/aura/remote_root_window_host_win.h » ('j') | 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/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/root_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(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);
18 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(string16*, kTooltipTextKey, NULL); 18 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(base::string16*, kTooltipTextKey, NULL);
19 19
20 void SetTooltipClient(RootWindow* root_window, TooltipClient* client) { 20 void SetTooltipClient(RootWindow* root_window, TooltipClient* client) {
21 root_window->SetProperty(kRootWindowTooltipClientKey, client); 21 root_window->SetProperty(kRootWindowTooltipClientKey, client);
22 } 22 }
23 23
24 TooltipClient* GetTooltipClient(RootWindow* root_window) { 24 TooltipClient* GetTooltipClient(RootWindow* root_window) {
25 return root_window ? 25 return root_window ?
26 root_window->GetProperty(kRootWindowTooltipClientKey) : NULL; 26 root_window->GetProperty(kRootWindowTooltipClientKey) : NULL;
27 } 27 }
28 28
29 void SetTooltipText(Window* window, string16* tooltip_text) { 29 void SetTooltipText(Window* window, base::string16* tooltip_text) {
30 window->SetProperty(kTooltipTextKey, tooltip_text); 30 window->SetProperty(kTooltipTextKey, tooltip_text);
31 } 31 }
32 32
33 const string16 GetTooltipText(Window* window) { 33 const base::string16 GetTooltipText(Window* window) {
34 string16* string_ptr = window->GetProperty(kTooltipTextKey); 34 base::string16* string_ptr = window->GetProperty(kTooltipTextKey);
35 return string_ptr ? *string_ptr : string16(); 35 return string_ptr ? *string_ptr : base::string16();
36 } 36 }
37 37
38 } // namespace client 38 } // namespace client
39 } // namespace aura 39 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/client/tooltip_client.h ('k') | ui/aura/remote_root_window_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698