Follow-up fixes to http://crrev.com/12638033.

ui/message_center/views/notification_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_VIEWS_NOTIFICATION_VIEW_H_
 #define UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_
 
 #include <vector>
 
 #include "ui/message_center/views/message_view.h"
 
 namespace views {
-class ImageView;
 class Label;
 }  // namespace views
 
 namespace message_center {
 
 class NotificationChangeObserver;
 
 // View that displays all current types of notification (web, basic, image, and
 // list). Future notification types may be handled by other classes, in which
 // case instances of those classes would be returned by the Create() factory
@@ skipping 23 matching lines @@
   NotificationView(const Notification& notification,
                    NotificationChangeObserver* observer,
                    bool expanded);
 
   // Weak references to NotificationView descendants owned by their parents.
   views::View* background_view_;
   views::View* top_view_;
   views::Label* title_view_;
   views::Label* message_view_;
   std::vector<views::View*> item_views_;
-  views::ImageView* icon_view_;
+  views::View* icon_view_;
   views::View* bottom_view_;
-  views::ImageView* image_view_;
-  std::vector<views::Button*> action_buttons_;
+  views::View* image_view_;
+  std::vector<views::View*> action_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationView);
 };
 
 }  // namespace message_center
 
 #endif // UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_VIEW_H_