diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 22:53:11 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 22:53:11 +0000 |
| commit | 754b00892f26fe56ed59e8659e517ef4097f101a (patch) | |
| tree | 4fb7d28025e37e9a5360baaccd221666976cab2c /views/controls | |
| parent | 7ecf29ce9af999e31929e8795d8d020d95219276 (diff) | |
| download | chromium_src-754b00892f26fe56ed59e8659e517ef4097f101a.zip chromium_src-754b00892f26fe56ed59e8659e517ef4097f101a.tar.gz chromium_src-754b00892f26fe56ed59e8659e517ef4097f101a.tar.bz2 | |
views: Make View::GetBaseline() a const method.
BUG=72040
TEST=None
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7086008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/label.cc | 2 | ||||
| -rw-r--r-- | views/controls/label.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index dc5c4de..fc392aa 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -176,7 +176,7 @@ gfx::Insets Label::GetInsets() const { return insets; } -int Label::GetBaseline() { +int Label::GetBaseline() const { return GetInsets().top() + font_.GetBaseline(); } diff --git a/views/controls/label.h b/views/controls/label.h index 2c3060d..24944cd 100644 --- a/views/controls/label.h +++ b/views/controls/label.h @@ -153,7 +153,7 @@ class Label : public View { // Overridden from View: virtual gfx::Insets GetInsets() const; - virtual int GetBaseline() OVERRIDE; + virtual int GetBaseline() const OVERRIDE; // Overridden to compute the size required to display this label. virtual gfx::Size GetPreferredSize() OVERRIDE; // Return the height necessary to display this label with the provided width. |