Index: ui/views/corewm/tooltip_controller.h |
diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h |
index 9815df1817a46d4f76cf17c459310b0502a34ead..1992443c7bbe62aea5c4cd0e836e13f8847a86b5 100644 |
--- a/ui/views/corewm/tooltip_controller.h |
+++ b/ui/views/corewm/tooltip_controller.h |
@@ -61,7 +61,8 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient, |
void TooltipShownTimerFired(); |
// Updates the tooltip if required (if there is any change in the tooltip |
- // text or the aura::Window. |
+ // text or the aura::Window). If |force| is true the tooltip will be updated |
sky
2014/04/23 20:08:46
There is no force here.
Mikus
2014/04/24 08:39:56
Done.
|
+ // regardless of these conditions. |
void UpdateIfRequired(); |
// Only used in tests. |
@@ -81,6 +82,7 @@ class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient, |
aura::Window* tooltip_window_; |
base::string16 tooltip_text_; |
+ const void* tooltip_unique_; |
// These fields are for tracking state when the user presses a mouse button. |
aura::Window* tooltip_window_at_mouse_press_; |