Remove the most obvious dead code from message center.

ui/message_center/views/message_center_view.cc

 // Copyright (c) 2013 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/views/message_center_view.h"
 
 #include <list>
 #include <map>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 43 matching lines @@
 const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4);
 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
 const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0);
 const SkColor kButtonTextHighlightColor = SkColorSetRGB(0x2a, 0x2a, 0x2a);
 const SkColor kButtonTextHoverColor = SkColorSetRGB(0x2a, 0x2a, 0x2a);
 const int kAnimateClearingNextNotificationDelayMS = 40;
 
 static const int kDefaultFrameRateHz = 60;
 static const int kDefaultAnimationDurationMs = 120;
 
-// PoorMessageCenterButtonBar //////////////////////////////////////////////////
-
-// The view for the buttons at the bottom of the message center window used
-// when kEnableRichNotifications is false (hence the "poor" in the name :-).
-class PoorMessageCenterButtonBar : public MessageCenterButtonBar,
-                                   public views::ButtonListener {
- public:
-  PoorMessageCenterButtonBar(MessageCenterView* message_center_view,
-                             MessageCenter* message_center);
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PoorMessageCenterButtonBar);
-};
-
-PoorMessageCenterButtonBar::PoorMessageCenterButtonBar(
-    MessageCenterView* message_center_view, MessageCenter* message_center)
-    : MessageCenterButtonBar(message_center_view, message_center) {
-  set_background(views::Background::CreateBackgroundPainter(
-      true,
-      views::Painter::CreateVerticalGradient(kBackgroundLightColor,
-                                             kBackgroundDarkColor)));
-  set_border(views::Border::CreateSolidSidedBorder(
-      2, 0, 0, 0, kBorderDarkColor));
-
-  views::GridLayout* layout = new views::GridLayout(this);
-  SetLayoutManager(layout);
-  views::ColumnSet* columns = layout->AddColumnSet(0);
-  columns->AddPaddingColumn(100, 0);
-  columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
-                     0, /* resize percent */
-                     views::GridLayout::USE_PREF, 0, 0);
-  columns->AddPaddingColumn(0, 4);
-
-  ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
-  views::LabelButton* close_all_button = new views::LabelButton(
-      this, resource_bundle.GetLocalizedString(IDS_MESSAGE_CENTER_CLEAR_ALL));
-  close_all_button->SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  close_all_button->set_request_focus_on_press(false);
-  close_all_button->SetTextColor(views::Button::STATE_NORMAL, kFooterTextColor);
-  close_all_button->SetTextColor(views::Button::STATE_HOVERED,
-                                 kButtonTextHoverColor);
-
-  layout->AddPaddingRow(0, 4);
-  layout->StartRow(0, 0);
-  layout->AddView(close_all_button);
-  set_close_all_button(close_all_button);
-}
-
-void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender,
-                                               const ui::Event& event) {
-  if (sender == close_all_button())
-    message_center_view()->ClearAllNotifications();
-}
+}  // namespace
 
 // NotificationCenterButton ////////////////////////////////////////////////////
 
 class NotificationCenterButton : public views::ToggleImageButton {
  public:
   NotificationCenterButton(views::ButtonListener* listener,
                            int normal_id,
                            int hover_id,
                            int pressed_id,
                            int text_id);
@@ skipping 29 matching lines @@
   return gfx::Size(kButtonSize, kButtonSize);
 }
 
 void NotificationCenterButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     canvas->DrawRect(gfx::Rect(2, 1, width() - 4, height() - 3),
                      kFocusBorderColor);
   }
 }
 
-// RichMessageCenterButtonBar //////////////////////////////////////////////////
+// MessageCenterButtonBar //////////////////////////////////////////////////
 
-// TODO(mukai): Merge this into MessageCenterButtonBar and get rid of
-// PoorMessageCenterButtonBar when the kEnableRichNotifications flag disappears.
-class RichMessageCenterButtonBar : public MessageCenterButtonBar,
-                                   public views::ButtonListener {
- public:
-  RichMessageCenterButtonBar(MessageCenterView* message_center_view,
-                             MessageCenter* message_center);
-
- private:
-  // Overridden from MessageCenterButtonBar:
-  virtual void SetAllButtonsEnabled(bool enabled) OVERRIDE;
-
-  // Overridden from views::View:
-  virtual void ChildVisibilityChanged(views::View* child) OVERRIDE;
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
-
-  NotificationCenterButton* settings_button_;
-  NotificationCenterButton* quiet_mode_button_;
-
-  DISALLOW_COPY_AND_ASSIGN(RichMessageCenterButtonBar);
-};
-
-RichMessageCenterButtonBar::RichMessageCenterButtonBar(
-    MessageCenterView* message_center_view, MessageCenter* message_center)
-  : MessageCenterButtonBar(message_center_view, message_center) {
+MessageCenterButtonBar::MessageCenterButtonBar(
+    MessageCenterView* message_center_view,
+    MessageCenter* message_center)
+    : message_center_view_(message_center_view),
+      message_center_(message_center),
+      close_all_button_(NULL) {
   if (get_use_acceleration_when_possible())
     SetPaintToLayer(true);
   set_background(views::Background::CreateSolidBackground(
       kMessageCenterBackgroundColor));
 
   views::Label* notification_label = new views::Label(l10n_util::GetStringUTF16(
       IDS_MESSAGE_CENTER_FOOTER_TITLE));
   notification_label->SetAutoColorReadabilityEnabled(false);
   notification_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   notification_label->SetEnabledColor(kRegularTextColor);
@@ skipping 48 matching lines @@
   views::ColumnSet* column = layout->AddColumnSet(0);
   column->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                     1.0f, views::GridLayout::USE_PREF, 0, 0);
   column->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
                     0, views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
   layout->AddView(notification_label);
   layout->AddView(button_container);
 }
 
-// Overridden from MessageCenterButtonBar:
-void RichMessageCenterButtonBar::SetAllButtonsEnabled(bool enabled) {
-  MessageCenterButtonBar::SetAllButtonsEnabled(enabled);
+MessageCenterButtonBar::~MessageCenterButtonBar() {}
+
+void MessageCenterButtonBar::SetAllButtonsEnabled(bool enabled) {
+  if (close_all_button_)
+    close_all_button_->SetEnabled(enabled);
   settings_button_->SetEnabled(enabled);
   quiet_mode_button_->SetEnabled(enabled);
 }
 
+void MessageCenterButtonBar::SetCloseAllVisible(bool visible) {
+  if (close_all_button_)
+    close_all_button_->SetVisible(visible);
+}
+
 // Overridden from views::View:
-void RichMessageCenterButtonBar::ChildVisibilityChanged(views::View* child) {
+void MessageCenterButtonBar::ChildVisibilityChanged(views::View* child) {
   InvalidateLayout();
 }
 
 // Overridden from views::ButtonListener:
-void RichMessageCenterButtonBar::ButtonPressed(views::Button* sender,
-                                               const ui::Event& event) {
+void MessageCenterButtonBar::ButtonPressed(views::Button* sender,
+                                           const ui::Event& event) {
   if (sender == close_all_button()) {
     message_center_view()->ClearAllNotifications();
   } else if (sender == settings_button_) {
     MessageCenterView* center_view = static_cast<MessageCenterView*>(parent());
     center_view->SetSettingsVisible(!center_view->settings_visible());
   } else if (sender == quiet_mode_button_) {
     if (message_center()->IsQuietMode())
       message_center()->SetQuietMode(false);
     else
       message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
@@ skipping 22 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BoundedScrollView);
 };
 
 BoundedScrollView::BoundedScrollView(int min_height, int max_height)
     : min_height_(min_height),
       max_height_(max_height) {
   set_notify_enter_exit_on_child(true);
   // Cancels the default dashed focus border.
   set_focus_border(NULL);
-  if (IsRichNotificationEnabled()) {
-    set_background(views::Background::CreateSolidBackground(
-        kMessageCenterBackgroundColor));
-    SetVerticalScrollBar(new views::OverlayScrollBar(false));
-  }
+  set_background(
+      views::Background::CreateSolidBackground(kMessageCenterBackgroundColor));
+  SetVerticalScrollBar(new views::OverlayScrollBar(false));
 }
 
 gfx::Size BoundedScrollView::GetPreferredSize() {
   gfx::Size size = contents()->GetPreferredSize();
   size.SetToMax(gfx::Size(size.width(), min_height_));
   size.SetToMin(gfx::Size(size.width(), max_height_));
   gfx::Insets insets = GetInsets();
   size.Enlarge(insets.width(), insets.height());
   return size;
 }
@@ skipping 56 matching lines @@
 int NoNotificationMessageView::GetHeightForWidth(int width) {
   return kMinScrollViewHeight;
 }
 
 void NoNotificationMessageView::Layout() {
   int text_height = label_->GetHeightForWidth(width());
   int margin = (height() - text_height) / 2;
   label_->SetBounds(0, margin, width(), text_height);
 }
 
-}  // namespace
-
-// MessageListView /////////////////////////////////////////////////////////////
-
-// Displays a list of messages.
-class MessageListView : public views::View {
- public:
-  explicit MessageListView(MessageCenterView* message_center_view);
-
-  // The interface for repositioning.
-  virtual void AddNotificationAt(views::View* view, int i);
-  virtual void RemoveNotificationAt(int i);
-  virtual void UpdateNotificationAt(views::View* view, int i);
-  virtual void SetRepositionTarget(const gfx::Rect& target_rect) {}
-  virtual void ResetRepositionSession() {}
-  virtual void ClearAllNotifications(const gfx::Rect& visible_scroll_rect);
-
- protected:
-  MessageCenterView* message_center_view() const {
-    return message_center_view_;
-  }
-
- private:
-  MessageCenterView* message_center_view_;  // Weak reference.
-
-  DISALLOW_COPY_AND_ASSIGN(MessageListView);
-};
-
-MessageListView::MessageListView(MessageCenterView* message_center_view)
-    : message_center_view_(message_center_view) {
-  views::BoxLayout* layout =
-      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1);
-  layout->set_spread_blank_space(true);
-  SetLayoutManager(layout);
-}
-
-void MessageListView::AddNotificationAt(views::View* view, int i) {
-  AddChildViewAt(view, i);
-}
-
-void MessageListView::RemoveNotificationAt(int i) {
-  delete child_at(i);
-}
-
-void MessageListView::UpdateNotificationAt(views::View* view, int i) {
-  delete child_at(i);
-  AddChildViewAt(view, i);
-}
-
-void MessageListView::ClearAllNotifications(
-    const gfx::Rect& visible_scroll_rect) {
-  message_center_view_->OnAllNotificationsCleared();
-}
-
 // Displays a list of messages for rich notifications. It also supports
 // repositioning.
-class RichMessageListView : public MessageListView,
-                            public views::BoundsAnimatorObserver {
+class MessageListView : public views::View,
+                        public views::BoundsAnimatorObserver {
  public:
-  explicit RichMessageListView(MessageCenterView* message_center_view);
-  virtual ~RichMessageListView();
+  explicit MessageListView(MessageCenterView* message_center_view);
+  virtual ~MessageListView();
+
+  // Overridden from MessageListView.

[Jun Mukai, 2013/07/01 20:48:58]

not overridden.  you should remove virtual too

[dewittj, 2013/07/01 23:58:30]

Done.

+  virtual void AddNotificationAt(views::View* view, int i);
+  virtual void RemoveNotificationAt(int i);
+  virtual void UpdateNotificationAt(views::View* view, int i);
+  virtual void SetRepositionTarget(const gfx::Rect& target_rect);
+  virtual void ResetRepositionSession();
+  virtual void ClearAllNotifications(const gfx::Rect& visible_scroll_rect);
 
  protected:
   // Overridden from views::View.
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual int GetHeightForWidth(int width) OVERRIDE;
 
-  // Overridden from MessageListView.
-  virtual void AddNotificationAt(views::View* view, int i) OVERRIDE;
-  virtual void RemoveNotificationAt(int i) OVERRIDE;
-  virtual void UpdateNotificationAt(views::View* view, int i) OVERRIDE;
-  virtual void SetRepositionTarget(const gfx::Rect& target_rect) OVERRIDE;
-  virtual void ResetRepositionSession() OVERRIDE;
-  virtual void ClearAllNotifications(
-      const gfx::Rect& visible_scroll_rect) OVERRIDE;
-
   // Overridden from views::BoundsAnimatorObserver.
   virtual void OnBoundsAnimatorProgressed(
       views::BoundsAnimator* animator) OVERRIDE;
   virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE;
 
  private:
   // Returns the actual index for child of |index|.
-  // RichMessageListView allows to slide down upper notifications, which means
+  // MessageListView allows to slide down upper notifications, which means
   // that the upper ones should come above the lower ones. To achieve this,
   // inversed order is adopted. The top most notification is the last child,
   // and the bottom most notification is the first child.
   int GetActualIndex(int index);
   bool IsValidChild(views::View* child);
   void DoUpdateIfPossible();
 
   // Schedules animation for a child to the specified position.
   void AnimateChild(views::View* child, int top, int height);
 
   // Animate clearing one notification.
   void AnimateClearingOneNotification();
+  MessageCenterView* message_center_view() const {
+    return message_center_view_;
+  }
 
+  MessageCenterView* message_center_view_;  // Weak reference.
   // The top position of the reposition target rectangle.
   int reposition_top_;
-
   int fixed_height_;
-
   bool has_deferred_task_;
   bool clear_all_started_;
   std::set<views::View*> adding_views_;
   std::set<views::View*> deleting_views_;
   std::set<views::View*> deleted_when_done_;
   std::list<views::View*> clearing_all_views_;
   scoped_ptr<views::BoundsAnimator> animator_;
-  base::WeakPtrFactory<RichMessageListView> weak_ptr_factory_;
+  base::WeakPtrFactory<MessageListView> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(RichMessageListView);
+  DISALLOW_COPY_AND_ASSIGN(MessageListView);
 };
 
-RichMessageListView::RichMessageListView(MessageCenterView* message_center_view)
-    : MessageListView(message_center_view),
+MessageListView::MessageListView(MessageCenterView* message_center_view)
+    : message_center_view_(message_center_view),
       reposition_top_(-1),
       fixed_height_(0),
       has_deferred_task_(false),
       clear_all_started_(false),
       weak_ptr_factory_(this) {
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1);
+  layout->set_spread_blank_space(true);
+  SetLayoutManager(layout);
+
   // Set the margin to 0 for the layout. BoxLayout assumes the same margin
   // for top and bottom, but the bottom margin here should be smaller
   // because of the shadow of message view. Use an empty border instead
   // to provide this margin.
   gfx::Insets shadow_insets = MessageView::GetShadowInsets();
   set_background(views::Background::CreateSolidBackground(
       kMessageCenterBackgroundColor));
   set_border(views::Border::CreateEmptyBorder(
       kMarginBetweenItems - shadow_insets.top(), /* top */
       kMarginBetweenItems - shadow_insets.left(), /* left */
       kMarginBetweenItems - shadow_insets.bottom(),  /* bottom */
       kMarginBetweenItems - shadow_insets.right() /* right */ ));
 }
 
-RichMessageListView::~RichMessageListView() {
+MessageListView::~MessageListView() {
   if (animator_.get())
     animator_->RemoveObserver(this);
 }
 
-void RichMessageListView::Layout() {
+void MessageListView::Layout() {
   if (animator_.get())
     return;
 
   gfx::Rect child_area = GetContentsBounds();
   int top = child_area.y();
   int between_items =
       kMarginBetweenItems - MessageView::GetShadowInsets().bottom();
 
   for (int i = child_count() - 1; i >= 0; --i) {
     views::View* child = child_at(i);
     if (!child->visible())
       continue;
     int height = child->GetHeightForWidth(child_area.width());
     child->SetBounds(child_area.x(), top, child_area.width(), height);
     top += height + between_items;
   }
 }
 
-void RichMessageListView::AddNotificationAt(views::View* view, int i) {
+void MessageListView::AddNotificationAt(views::View* view, int i) {
   // Increment by 1 because the default behavior of AddChildViewAt() is to
   // insert before the specified index.
   AddChildViewAt(view, GetActualIndex(i) + 1);
   if (GetContentsBounds().IsEmpty())
     return;
 
   adding_views_.insert(view);
   DoUpdateIfPossible();
 }
 
-void RichMessageListView::RemoveNotificationAt(int i) {
+void MessageListView::RemoveNotificationAt(int i) {
   views::View* child = child_at(GetActualIndex(i));
   if (GetContentsBounds().IsEmpty()) {
     delete child;
   } else {
     if (child->layer()) {
       deleting_views_.insert(child);
     } else {
       if (animator_.get())
         animator_->StopAnimatingView(child);
       delete child;
     }
     DoUpdateIfPossible();
   }
 }
 
-void RichMessageListView::UpdateNotificationAt(views::View* view, int i) {
+void MessageListView::UpdateNotificationAt(views::View* view, int i) {
   int actual_index = GetActualIndex(i);
   views::View* child = child_at(actual_index);
   if (animator_.get())
     animator_->StopAnimatingView(child);
   gfx::Rect old_bounds = child->bounds();
   if (deleting_views_.find(child) != deleting_views_.end())
     deleting_views_.erase(child);
   if (deleted_when_done_.find(child) != deleted_when_done_.end())
     deleted_when_done_.erase(child);
   delete child;
   AddChildViewAt(view, actual_index);
   view->SetBounds(old_bounds.x(), old_bounds.y(), old_bounds.width(),
                   view->GetHeightForWidth(old_bounds.width()));
   DoUpdateIfPossible();
 }
 
-gfx::Size RichMessageListView::GetPreferredSize() {
+gfx::Size MessageListView::GetPreferredSize() {
   int width = 0;
   for (int i = 0; i < child_count(); i++) {
     views::View* child = child_at(i);
     if (IsValidChild(child))
       width = std::max(width, child->GetPreferredSize().width());
   }
 
   return gfx::Size(width + GetInsets().width(),
                    GetHeightForWidth(width + GetInsets().width()));
 }
 
-int RichMessageListView::GetHeightForWidth(int width) {
+int MessageListView::GetHeightForWidth(int width) {
   if (fixed_height_ > 0)
     return fixed_height_;
 
   width -= GetInsets().width();
   int height = 0;
   int padding = 0;
   for (int i = 0; i < child_count(); ++i) {
     views::View* child = child_at(i);
     if (!IsValidChild(child))
       continue;
     height += child->GetHeightForWidth(width) + padding;
     padding = kMarginBetweenItems - MessageView::GetShadowInsets().bottom();
   }
 
   return height + GetInsets().height();
 }
 
-void RichMessageListView::SetRepositionTarget(const gfx::Rect& target) {
+void MessageListView::SetRepositionTarget(const gfx::Rect& target) {
   reposition_top_ = target.y();
   fixed_height_ = GetHeightForWidth(width());
 }
 
-void RichMessageListView::ResetRepositionSession() {
+void MessageListView::ResetRepositionSession() {
   // Don't call DoUpdateIfPossible(), but let Layout() do the task without
   // animation. Reset will cause the change of the bubble size itself, and
   // animation from the old location will look weird.
   if (reposition_top_ >= 0 && animator_.get()) {
     has_deferred_task_ = false;
     // cancel cause OnBoundsAnimatorDone which deletes |deleted_when_done_|.
     animator_->Cancel();
     STLDeleteContainerPointers(deleting_views_.begin(), deleting_views_.end());
     deleting_views_.clear();
     adding_views_.clear();
     animator_.reset();
   }
 
   reposition_top_ = -1;
   fixed_height_ = 0;
 }
 
-void RichMessageListView::ClearAllNotifications(
+void MessageListView::ClearAllNotifications(
     const gfx::Rect& visible_scroll_rect) {
   for (int i = 0; i < child_count(); ++i) {
     views::View* child = child_at(i);
     if (!child->visible())
       continue;
     if (gfx::IntersectRects(child->bounds(), visible_scroll_rect).IsEmpty())
       continue;
     clearing_all_views_.push_back(child);
   }
   DoUpdateIfPossible();
 }
 
-void RichMessageListView::OnBoundsAnimatorProgressed(
+void MessageListView::OnBoundsAnimatorProgressed(
     views::BoundsAnimator* animator) {
   DCHECK_EQ(animator_.get(), animator);
   for (std::set<views::View*>::iterator iter = deleted_when_done_.begin();
        iter != deleted_when_done_.end(); ++iter) {
     const ui::SlideAnimation* animation = animator->GetAnimationForView(*iter);
     if (animation)
       (*iter)->layer()->SetOpacity(animation->CurrentValueBetween(1.0, 0.0));
   }
 }
 
-void RichMessageListView::OnBoundsAnimatorDone(
-    views::BoundsAnimator* animator) {
+void MessageListView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) {
   STLDeleteContainerPointers(
       deleted_when_done_.begin(), deleted_when_done_.end());
   deleted_when_done_.clear();
 
   if (clear_all_started_) {
     clear_all_started_ = false;
     message_center_view()->OnAllNotificationsCleared();
   }
 
   if (has_deferred_task_) {
     has_deferred_task_ = false;
     DoUpdateIfPossible();
   }
 
   if (GetWidget())
     GetWidget()->SynthesizeMouseMoveEvent();
 }
 
-int RichMessageListView::GetActualIndex(int index) {
+int MessageListView::GetActualIndex(int index) {
   // As is written in the comment in the declaration, this method
   // returns actual index for the |index|-th valid child from the end.
   int actual_index = child_count() - 1;
   // Skips the invalid children at last.
   for (; actual_index > 0; --actual_index) {
     if (IsValidChild(child_at(actual_index)))
       break;
   }
   // Find the |index|-th valid child from the end.
   for (; actual_index >= 0 && index > 0; --actual_index) {
     index -= IsValidChild(child_at(actual_index)) ? 1 : 0;
   }
   return actual_index;
 }
 
-bool RichMessageListView::IsValidChild(views::View* child) {
+bool MessageListView::IsValidChild(views::View* child) {
   return child->visible() &&
-      deleting_views_.find(child) == deleting_views_.end() &&
-      deleted_when_done_.find(child) == deleted_when_done_.end();
+         deleting_views_.find(child) == deleting_views_.end() &&
+         deleted_when_done_.find(child) == deleted_when_done_.end();
 }
 
-void RichMessageListView::DoUpdateIfPossible() {
+void MessageListView::DoUpdateIfPossible() {
   gfx::Rect child_area = GetContentsBounds();
   if (child_area.IsEmpty())
     return;
 
   if (animator_.get() && animator_->IsAnimating()) {
     has_deferred_task_ = true;
     return;
   }
 
   if (!animator_.get()) {
@@ skipping 23 matching lines @@
     for (int i = first_index; i < child_count(); ++i) {
       views::View* child = child_at(i);
       AnimateChild(child, bottom - child->height(), child->height());
       bottom -= child->height() + between_items;
     }
   }
   adding_views_.clear();
   deleting_views_.clear();
 }
 
-void RichMessageListView::AnimateChild(views::View* child,
-                                       int top,
-                                       int height) {
+void MessageListView::AnimateChild(views::View* child, int top, int height) {
   gfx::Rect child_area = GetContentsBounds();
   if (adding_views_.find(child) != adding_views_.end()) {
     child->SetBounds(child_area.right(), top, child_area.width(), height);
     animator_->AnimateViewTo(
         child, gfx::Rect(child_area.x(), top, child_area.width(), height));
   } else if (deleting_views_.find(child) != deleting_views_.end()) {
     DCHECK(child->layer());
     // No moves, but animate to fade-out.
     animator_->AnimateViewTo(child, child->bounds());
     deleted_when_done_.insert(child);
   } else {
     gfx::Rect target(child_area.x(), top, child_area.width(), height);
     if (child->bounds().origin() != target.origin())
       animator_->AnimateViewTo(child, target);
     else
       child->SetBoundsRect(target);
   }
 }
 
-void RichMessageListView::AnimateClearingOneNotification() {
+void MessageListView::AnimateClearingOneNotification() {
   DCHECK(!clearing_all_views_.empty());
 
   clear_all_started_ = true;
 
   views::View* child = clearing_all_views_.back();
   clearing_all_views_.pop_back();
 
   // Slide from left to right.
   gfx::Rect new_bounds = child->bounds();
   new_bounds.set_x(new_bounds.right() + kMarginBetweenItems);
   animator_->AnimateViewTo(child, new_bounds);
 
   // Schedule to start sliding out next notification after a short delay.
   if (!clearing_all_views_.empty()) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
-        base::Bind(&RichMessageListView::AnimateClearingOneNotification,
-                    weak_ptr_factory_.GetWeakPtr()),
+        base::Bind(&MessageListView::AnimateClearingOneNotification,
+                   weak_ptr_factory_.GetWeakPtr()),
         base::TimeDelta::FromMilliseconds(
             kAnimateClearingNextNotificationDelayMS));
   }
 }
 
-// MessageCenterButtonBar //////////////////////////////////////////////////////
-
-MessageCenterButtonBar::MessageCenterButtonBar(
-    MessageCenterView* message_center_view, MessageCenter* message_center)
-    : message_center_view_(message_center_view),
-      message_center_(message_center),
-      close_all_button_(NULL) {
-}
-
-MessageCenterButtonBar::~MessageCenterButtonBar() {
-}
-
-void MessageCenterButtonBar::SetAllButtonsEnabled(bool enabled) {
-  if (close_all_button_)
-    close_all_button_->SetEnabled(enabled);
-}
-
-void MessageCenterButtonBar::SetCloseAllVisible(bool visible) {
-  if (close_all_button_)
-    close_all_button_->SetVisible(visible);
-}
-
 // MessageCenterView ///////////////////////////////////////////////////////////
 
 MessageCenterView::MessageCenterView(MessageCenter* message_center,
                                      MessageCenterTray* tray,
                                      int max_height,
                                      bool initially_settings_visible)
     : message_center_(message_center),
       tray_(tray),
       settings_visible_(initially_settings_visible) {
   message_center_->AddObserver(this);
   set_notify_enter_exit_on_child(true);
   set_background(views::Background::CreateSolidBackground(
       kMessageCenterBackgroundColor));
 
-  if (IsRichNotificationEnabled())
-    button_bar_ = new RichMessageCenterButtonBar(this, message_center);
-  else
-    button_bar_ = new PoorMessageCenterButtonBar(this, message_center);
+  button_bar_ = new MessageCenterButtonBar(this, message_center);
 
   const int button_height = button_bar_->GetPreferredSize().height();
   scroller_ = new BoundedScrollView(kMinScrollViewHeight,
                                     max_height - button_height);
 
   if (get_use_acceleration_when_possible()) {
     scroller_->SetPaintToLayer(true);
     scroller_->SetFillsBoundsOpaquely(false);
     scroller_->layer()->SetMasksToBounds(true);
   }
 
-  message_list_view_ = IsRichNotificationEnabled() ?
-      new RichMessageListView(this) : new MessageListView(this);
+  message_list_view_ = new MessageListView(this);
   no_notifications_message_view_ = new NoNotificationMessageView();
   // Set the default visibility to false, otherwise the notification has slide
   // in animation when the center is shown.
   no_notifications_message_view_->SetVisible(false);
   message_list_view_->AddChildView(no_notifications_message_view_);
   scroller_->SetContents(message_list_view_);
 
   settings_view_ = new NotifierSettingsView(
       message_center_->GetNotifierSettingsProvider());
 
@@ skipping 80 matching lines @@
   scroller_->SetEnabled(true);
   button_bar_->SetAllButtonsEnabled(true);
   message_center_->RemoveAllNotifications(true);  // Action by user.
 }
 
 size_t MessageCenterView::NumMessageViewsForTest() const {
   return message_list_view_->child_count();
 }
 
 void MessageCenterView::Layout() {
-  int between_child = IsRichNotificationEnabled() ? 0 : 1;
   int button_height = button_bar_->GetHeightForWidth(width());
   // Skip unnecessary re-layout of contents during the resize animation.
   if (settings_transition_animation_ &&
       settings_transition_animation_->is_animating() &&
       settings_transition_animation_->current_part_index() == 0) {
     button_bar_->SetBounds(0, height() - button_height, width(), button_height);
     return;
   }
 
-  scroller_->SetBounds(0, 0, width(), height() - button_height - between_child);
-  settings_view_->SetBounds(
-      0, 0, width(), height() - button_height - between_child);
+  scroller_->SetBounds(0, 0, width(), height() - button_height);
+  settings_view_->SetBounds(0, 0, width(), height() - button_height);
 
   bool is_scrollable = false;
   if (scroller_->visible())
     is_scrollable = scroller_->height() < message_list_view_->height();
   else
     is_scrollable = settings_view_->IsScrollable();
 
   if (is_scrollable && !button_bar_->border()) {
     button_bar_->set_border(views::Border::CreateSolidSidedBorder(
         1, 0, 0, 0, kFooterDelimiterColor));
@@ skipping 200 matching lines @@
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(views::View* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center