diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 20:30:54 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-16 20:30:54 +0000 |
| commit | 261e4fbd2962bf913dfa938386ec29090b53fcbd (patch) | |
| tree | b14726f207217e4217919cd05dc9ecdbdee96de5 /ui/message_center/base_format_view.cc | |
| parent | c610fbf5402c3414dc76949a88c6118318d4ca3a (diff) | |
| download | chromium_src-261e4fbd2962bf913dfa938386ec29090b53fcbd.zip chromium_src-261e4fbd2962bf913dfa938386ec29090b53fcbd.tar.gz chromium_src-261e4fbd2962bf913dfa938386ec29090b53fcbd.tar.bz2 | |
Revert 173387 - Broke compile on clang bots
Added support for secondary icon to multi-item notification view
TBR=derat@chromium.org for c/b/ui/views/ash/balloon_view_ash.*
BUG=161101
Review URL: https://chromiumcodereview.appspot.com/11474003
TBR=dharcourt@chromium.org
Review URL: https://codereview.chromium.org/11593003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center/base_format_view.cc')
| -rw-r--r-- | ui/message_center/base_format_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/message_center/base_format_view.cc b/ui/message_center/base_format_view.cc index 7bce22c..aff72a1 100644 --- a/ui/message_center/base_format_view.cc +++ b/ui/message_center/base_format_view.cc @@ -46,13 +46,13 @@ void BaseFormatView::SetUpView() { views::ImageView* icon = new views::ImageView; icon->SetImageSize( gfx::Size(kBaseFormatPrimaryIconWidth, kBaseFormatPrimaryIconWidth)); - icon->SetImage(notification_.primary_icon); + icon->SetImage(notification_.image); views::ImageView* second_icon = new views::ImageView; second_icon->SetImageSize( gfx::Size(kBaseFormatSecondaryIconWidth, kBaseFormatSecondaryIconWidth)); // TODO: set up second image - second_icon->SetImage(notification_.primary_icon); + second_icon->SetImage(notification_.image); views::Label* title = new views::Label(notification_.title); title->SetHorizontalAlignment(gfx::ALIGN_LEFT); |