Move common notification layout to base class

ash/system/tray/tray_views.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 ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 #pragma once
 
 #include "ash/ash_export.h"
 #include "ui/gfx/font.h"
@@ skipping 224 matching lines @@
   // Overridden from views::View.
   virtual void Layout() OVERRIDE;
 
   views::View* content_;
   views::View* button_container_;
   views::Label* text_label_;
   DISALLOW_COPY_AND_ASSIGN(SpecialPopupRow);
 };
 
 // A view for closable notification views, laid out like:
-// [      contents  (x) ]
-// The close button will call OnClose() when pressed.
+//  -------------------
+// | icon  contents  x |
+//  ----------------v--
+// The close button will call OnClose() when clicked.
 class TrayNotificationView : public views::View,
                              public views::ButtonListener {
  public:
-  TrayNotificationView();
+  // If icon_id is 0, no icon image will be set. SetIconImage can be called
+  // to later set the icon image.
+  explicit TrayNotificationView(int icon_id);
   virtual ~TrayNotificationView();
 
   // InitView must be called once with the contents to be displayed.
   void InitView(views::View* contents);
 
+  // Sets/updates the icon image.
+  void SetIconImage(const SkBitmap& image);
+
+  // Replaces the contents view.
+  void UpdateView(views::View* new_contents);
+
+  // Replaces the contents view and updates the icon image.
+  void UpdateViewAndImage(views::View* new_contents, const SkBitmap& image);
+
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event) OVERRIDE;
 
  protected:
   // Called when the closed button is pressed.
   virtual void OnClose() = 0;
 
  private:
+  int icon_id_;
+  views::ImageView* icon_;
+
   DISALLOW_COPY_AND_ASSIGN(TrayNotificationView);
 };
 
 // Sets up a Label properly for the tray (sets color, font etc.).
 void SetupLabelForTray(views::Label* label);
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_