diff options
| author | dharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 03:22:50 +0000 |
|---|---|---|
| committer | dharcourt@chromium.org <dharcourt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 03:22:50 +0000 |
| commit | c11ecccf6806ad44dead13e6853ceb12ea74386c (patch) | |
| tree | 10cf91dc6bda813ae1fc3c29289e90d901429036 /ui/message_center/base_format_view.cc | |
| parent | 6954fe1ebf4fcf45e881e5ef1b09f5d0cb529b68 (diff) | |
| download | chromium_src-c11ecccf6806ad44dead13e6853ceb12ea74386c.zip chromium_src-c11ecccf6806ad44dead13e6853ceb12ea74386c.tar.gz chromium_src-c11ecccf6806ad44dead13e6853ceb12ea74386c.tar.bz2 | |
This is a modified version of http://crrev.com/11474003. That change
list received a LGTM and was committed as 173387 but then reverted with
173388 because it generated some Clang errors that were not detected in
local or try builds.
This version's only changes relative to http://crrev.com/11474003 are:
1) The removal of the unused kNoBitmaps global object in
balloon_view_ash.cc that was causing a |declaration requires an
exit-time destructor| Clang error.
2) The addition of a BalloonViewAsh::DownloadImages::~DownloadImage()
virtual destructor in balloon_view_ash.cc to avoid a |delete called on
... that has virtual functions but non-virtual destructor| Clang error.
3) The removal of unnecessary imports of <map> and notification_types.h
and of an unnecessary forward declaration of skBitmap in
balloon_view_ash.h.
TBR=derat@chromium.org for OWNERS review of balloon_view_ash.{h,cc} changes.
BUG=161101
Review URL: https://chromiumcodereview.appspot.com/11588009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174929 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 aff72a1..7bce22c 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_.image); + icon->SetImage(notification_.primary_icon); views::ImageView* second_icon = new views::ImageView; second_icon->SetImageSize( gfx::Size(kBaseFormatSecondaryIconWidth, kBaseFormatSecondaryIconWidth)); // TODO: set up second image - second_icon->SetImage(notification_.image); + second_icon->SetImage(notification_.primary_icon); views::Label* title = new views::Label(notification_.title); title->SetHorizontalAlignment(gfx::ALIGN_LEFT); |