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

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

Issue 213833018: Aura tooltips do not move on mouse move in case of many neighboring views with the same label (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change the unique id of tooltip text from void** to void* Created 6 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
« ui/wm/public/tooltip_client.h ('K') | « ui/wm/public/tooltip_client.h ('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*) 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*, kTooltipIdKey, 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, base::string16* tooltip_text) {
33 window->SetProperty(kTooltipTextKey, tooltip_text); 35 window->SetProperty(kTooltipTextKey, tooltip_text);
36 window->SetProperty(kTooltipIdKey, static_cast<void*>(NULL));
sky 2014/06/02 15:39:47 Is this really necessary?
37 }
38
39 void UpdateTooltipId(Window* window, void* id) {
40 window->SetProperty(kTooltipIdKey, id);
34 } 41 }
35 42
36 const base::string16 GetTooltipText(Window* window) { 43 const base::string16 GetTooltipText(Window* window) {
37 base::string16* string_ptr = window->GetProperty(kTooltipTextKey); 44 base::string16* string_ptr = window->GetProperty(kTooltipTextKey);
38 return string_ptr ? *string_ptr : base::string16(); 45 return string_ptr ? *string_ptr : base::string16();
39 } 46 }
40 47
48 const void* GetTooltipId(Window* window) {
49 return window->GetProperty(kTooltipIdKey);
50 }
51
41 } // namespace client 52 } // namespace client
42 } // namespace aura 53 } // namespace aura
OLDNEW
« ui/wm/public/tooltip_client.h ('K') | « ui/wm/public/tooltip_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698