diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 22:25:33 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-17 22:25:33 +0000 |
| commit | 6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7 (patch) | |
| tree | 4ce1316dbfd179681bdff905a7d71f1b4cbb902c /chrome/views/text_button.cc | |
| parent | 4c45708be10906e3cdbe9d40d206cfd3fcbaf1c2 (diff) | |
| download | chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.zip chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.tar.gz chromium_src-6f3bb6ca5a2e423fc9dda71c164c7e8ae2a8eae7.tar.bz2 | |
Rename legacy methods that were in CamelCase to unix_hacker.
Required going through and modifying some of the code to
solve name clashes.
Review URL: http://codereview.chromium.org/2945
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/text_button.cc')
| -rw-r--r-- | chrome/views/text_button.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/views/text_button.cc b/chrome/views/text_button.cc index 5c694b4e..e4e7225 100644 --- a/chrome/views/text_button.cc +++ b/chrome/views/text_button.cc @@ -225,8 +225,8 @@ void TextButton::Paint(ChromeCanvas* canvas, bool for_drag) { } gfx::Insets insets = GetInsets(); - int available_width = GetWidth() - insets.width(); - int available_height = GetHeight() - insets.height(); + int available_width = width() - insets.width(); + int available_height = height() - insets.height(); // Use the actual text (not max) size to properly center the text. int content_width = text_size_.cx; if (icon_.width() > 0) { @@ -248,7 +248,7 @@ void TextButton::Paint(ChromeCanvas* canvas, bool for_drag) { if (icon_.width() > 0) text_x += icon_.width() + kIconTextPadding; const int text_width = std::min(static_cast<int>(text_size_.cx), - GetWidth() - insets.right() - text_x); + width() - insets.right() - text_x); int text_y = (available_height - text_size_.cy) / 2 + insets.top(); if (text_width > 0) { |