From 261e4fbd2962bf913dfa938386ec29090b53fcbd Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Sun, 16 Dec 2012 20:30:54 +0000 Subject: 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 --- ui/message_center/base_format_view.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/message_center/base_format_view.cc') 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); -- cgit v1.1