diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 02:09:35 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 02:09:35 +0000 |
| commit | fd71dc770317a005dc4fbb8c6ff59ad7a23a4ba1 (patch) | |
| tree | 560812a6905b429fda75892dc2f60bb553810f7c /ash/system/web_notification | |
| parent | 91c102a175e885ebacb02a7e58c56ab821e51402 (diff) | |
| download | chromium_src-fd71dc770317a005dc4fbb8c6ff59ad7a23a4ba1.zip chromium_src-fd71dc770317a005dc4fbb8c6ff59ad7a23a4ba1.tar.gz chromium_src-fd71dc770317a005dc4fbb8c6ff59ad7a23a4ba1.tar.bz2 | |
Specifies GetHeightForWidth to WebNotificationButton.
It uses FillLayout which may calculate the preferred height from the
content (text label) instead of the view's preferred size.
BUG=268622
R=stevenjb@chromium.org
TEST=manually
Review URL: https://chromiumcodereview.appspot.com/22932003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/web_notification')
| -rw-r--r-- | ash/system/web_notification/web_notification_tray.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 2a6e2de..e97ac5f 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -247,6 +247,10 @@ class WebNotificationButton : public views::CustomButton { return gfx::Size(kWebNotificationIconSize, kWebNotificationIconSize); } + virtual int GetHeightForWidth(int width) OVERRIDE { + return GetPreferredSize().height(); + } + private: void UpdateIconVisibility() { unread_label_->SetEnabledColor( |