diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 17:35:51 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 17:35:51 +0000 |
| commit | 8e090d8fc1957f191a88fcc6d0593f4d7f06d634 (patch) | |
| tree | fd13923b3a593f3ba06882e4c99fcea39940888e /chrome | |
| parent | 21f41240a85fbbb7f2048ac812154889c982b280 (diff) | |
| download | chromium_src-8e090d8fc1957f191a88fcc6d0593f4d7f06d634.zip chromium_src-8e090d8fc1957f191a88fcc6d0593f4d7f06d634.tar.gz chromium_src-8e090d8fc1957f191a88fcc6d0593f4d7f06d634.tar.bz2 | |
Fix regression caused by gfx::Size no longer accepting negative
dimensions.
BUG=11900
TEST=Open 'Show Saved Passwords' under Minor Tweaks. Should not crash, and the
'Show Password' button should be visible.
Review URL: http://codereview.chromium.org/115331
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/options/passwords_page_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc index 77c02ad..133efea 100644 --- a/chrome/browser/views/options/passwords_page_view.cc +++ b/chrome/browser/views/options/passwords_page_view.cc @@ -25,12 +25,11 @@ MultiLabelButtons::MultiLabelButtons(views::ButtonListener* listener, const std::wstring& alt_label) : NativeButton(listener, label), label_(label), - alt_label_(alt_label), - pref_size_(-1, -1) { + alt_label_(alt_label) { } gfx::Size MultiLabelButtons::GetPreferredSize() { - if (pref_size_.width() == -1 && pref_size_.height() == -1) { + if (pref_size_.IsEmpty()) { // Let's compute our preferred size. std::wstring current_label = label(); SetLabel(label_); |