diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 17:44:56 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 17:44:56 +0000 |
| commit | ec61b22f45400ac31619a5df4260c9579b17d32d (patch) | |
| tree | f8f3a789e7b471ddc327dabcd725e7edd840165c /ui/views/controls/progress_bar.cc | |
| parent | a1942be68cf5daaf2d30f8afb2f1c7c834b5c4bc (diff) | |
| download | chromium_src-ec61b22f45400ac31619a5df4260c9579b17d32d.zip chromium_src-ec61b22f45400ac31619a5df4260c9579b17d32d.tar.gz chromium_src-ec61b22f45400ac31619a5df4260c9579b17d32d.tar.bz2 | |
views: Fix progress bar tooltip text function.
We should not handle DCHECK failures, read
http://dev.chromium.org/developers/coding-style#TOC-CHECK-DCHECK-and-NOTREACHED-
for more information.
R=pkasting@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/11155002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/progress_bar.cc')
| -rw-r--r-- | ui/views/controls/progress_bar.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ui/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc index 0b93a1f..e07e0ec 100644 --- a/ui/views/controls/progress_bar.cc +++ b/ui/views/controls/progress_bar.cc @@ -41,8 +41,6 @@ void AddRoundRectPathWithPadding(int x, int y, SkScalar padding, SkPath* path) { DCHECK(path); - if (path == NULL) - return; SkRect rect; rect.set( SkIntToScalar(x) + padding, SkIntToScalar(y) + padding, @@ -169,9 +167,7 @@ void ProgressBar::SetTooltipText(const string16& tooltip_text) { bool ProgressBar::GetTooltipText(const gfx::Point& p, string16* tooltip) const { DCHECK(tooltip); - if (tooltip == NULL) - return false; - tooltip->assign(tooltip_text_); + *tooltip = tooltip_text_; return !tooltip_text_.empty(); } |