Notificaitons refactor step 2

ui/message_center/message_view.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_MESSAGE_VIEW_H_
 #define UI_MESSAGE_CENTER_MESSAGE_VIEW_H_
 
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/views/controls/button/button.h"
@@ skipping 11 matching lines @@
 const int kPaddingBetweenItems = 10;
 const int kPaddingHorizontal = 18;
 const int kWebNotificationButtonWidth = 32;
 const int kWebNotificationIconSize = 40;
 const int kWebNotificationWidth = 300;
 
 // An abstract class that forms the basis of a view for a notification entry.
 class MessageView : public views::SlideOutView,
                     public views::ButtonListener {
  public:
-  MessageView(NotificationList::Delegate* list_delegate,
-              const Notification& notification);
+  MessageView(NotificationList::Delegate* list_delegate);
 
   virtual ~MessageView();
 
   // Creates the elements that make up the view layout. Must be called
-  // immediately after construction.
-  virtual void SetUpView() = 0;
+  // immediately after construction. Derived classes must call the base
+  // class' implementation first.
+  // The view should not cache a reference to notification, since Notification
+  // may be destroyed before the view.
+  virtual void SetUpView(const Notification& notification);

[stevenjb, 2013/02/25 23:55:56]

message_view.cc does not appear to have uploaded correctly.

I'm not a huge fan of the pattern where a derived function has to call the base
class implementation. I would either copy the shared code if it's simple, or use
this pattern:

void SetupView(...) {
  <do something>
  PostSetup(...)
}

virtual void PostSetup() = 0;  (Or make the default a no-op)

[Dmitry Titov, 2013/02/26 01:01:51]

Done. Removed this virtual completely, moved some initialization to ctors.

 
   void set_scroller(views::ScrollView* scroller) { scroller_ = scroller; }
 
   // Overridden from views::View.
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
 
   // Overridden from ui::EventHandler.
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
  protected:
   MessageView();
 
   // Shows the menu for the notification.
   void ShowMenu(gfx::Point screen_location);
 
   // Overridden from views::SlideOutView.
   virtual void OnSlideOut() OVERRIDE;
 
   NotificationList::Delegate* list_delegate() { return list_delegate_; }
-  Notification& notification() { return notification_; }
+  const std::string& notification_id() { return notification_id_; }
+  const string16& display_source() const { return display_source_; }
+  const std::string& extension_id() const { return extension_id_; }
   views::ImageButton* close_button() { return close_button_.get(); }
   views::ScrollView* scroller() { return scroller_; }
 
  private:
-  NotificationList::Delegate* list_delegate_;
-  Notification notification_;
+  NotificationList::Delegate* list_delegate_; // Weak, global (MessageCenter).
+  std::string notification_id_;
+  string16 display_source_;
+  std::string extension_id_;
+
   scoped_ptr<views::ImageButton> close_button_;
 
   views::ScrollView* scroller_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageView);
 };
 
 }  // namespace message_center
 
 #endif // UI_MESSAGE_CENTER_MESSAGE_VIEW_H_