Notificaitons refactor step 2

ui/message_center/message_simple_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/message_simple_view.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace message_center {
 
 const SkColor kNotificationColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
 const SkColor kNotificationReadColor = SkColorSetRGB(0xfa, 0xfa, 0xfa);
 
 MessageSimpleView::MessageSimpleView(
-    NotificationList::Delegate* list_delegate,
-    const Notification& notification)
-    : MessageView(list_delegate, notification) {
+    NotificationList::Delegate* list_delegate)
+    : MessageView(list_delegate) {
   views::ImageButton* close = new views::ImageButton(this);
   close->SetImage(
       views::CustomButton::STATE_NORMAL,
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE));
   close->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                            views::ImageButton::ALIGN_MIDDLE);
   old_style_close_button_.reset(close);
 }
 
 MessageSimpleView::~MessageSimpleView() {
@@ skipping 15 matching lines @@
   if (!content_view_)
     return gfx::Size();
   gfx::Size size = content_view_->GetPreferredSize();
   if (border()) {
     gfx::Insets border_insets = border()->GetInsets();
     size.Enlarge(border_insets.width(), border_insets.height());
   }
   return size;
 }
 
-void MessageSimpleView::SetUpView() {
+void MessageSimpleView::SetUpView(const Notification& notification) {
+  MessageView::SetUpView(notification);
+
   views::ImageView* icon = new views::ImageView;
   icon->SetImageSize(
       gfx::Size(kWebNotificationIconSize, kWebNotificationIconSize));
-  icon->SetImage(notification().primary_icon);
+  icon->SetImage(notification.primary_icon());
 
-  views::Label* title = new views::Label(notification().title);
+  views::Label* title = new views::Label(notification.title());
   title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title->SetFont(title->font().DeriveFont(0, gfx::Font::BOLD));
-  views::Label* message = new views::Label(notification().message);
+  views::Label* message = new views::Label(notification.message());
   message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   message->SetMultiLine(true);
 
-  SkColor bg_color = notification().is_read ?
+  SkColor bg_color = notification.is_read() ?
       kNotificationReadColor : kNotificationColor;
   content_view_.reset(new views::View);
   content_view_->set_background(
       views::Background::CreateSolidBackground(bg_color));
   AddChildView(content_view_.get());
   views::GridLayout* layout = new views::GridLayout(content_view_.get());
   content_view_->SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
 
@@ skipping 41 matching lines @@
   layout->AddPaddingRow(0, kPaddingBetweenItems);
 }
 
 void MessageSimpleView::ButtonPressed(views::Button* sender,
                                       const ui::Event& event) {
   bool close = (sender == old_style_close_button_.get());
   MessageView::ButtonPressed(close ? close_button() : sender, event);
 }
 
 }  // namespace message_center