Index: ui/views/controls/progress_bar.cc |
diff --git a/ui/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc |
index 0b93a1fc3f9552a1393efd040bef4353305f1eac..4b1c74a1909d168ae78977a4072534b43f29b4af 100644 |
--- a/ui/views/controls/progress_bar.cc |
+++ b/ui/views/controls/progress_bar.cc |
@@ -168,11 +168,11 @@ void ProgressBar::SetTooltipText(const string16& tooltip_text) { |
} |
bool ProgressBar::GetTooltipText(const gfx::Point& p, string16* tooltip) const { |
- DCHECK(tooltip); |
Peter Kasting
2012/10/15 19:03:10
Why remove this?
|
- if (tooltip == NULL) |
+ if (tooltip_text_.empty()) |
Peter Kasting
2012/10/15 19:03:10
This is a behavior change: the old code still assi
tfarina
2012/10/15 19:15:49
The impact would be minimal, ProgressBar control i
Peter Kasting
2012/10/15 19:19:54
As long as the callers work fine with the behavior
|
return false; |
- tooltip->assign(tooltip_text_); |
- return !tooltip_text_.empty(); |
+ |
+ *tooltip = tooltip_text_; |
+ return true; |
} |
void ProgressBar::GetAccessibleState(ui::AccessibleViewState* state) { |