Message center re-organized

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 824 matching lines @@
 
 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) {
+}
+
+MessageCenterView::~MessageCenterView() {
+  message_center_->RemoveObserver(this);
+}
+
+void MessageCenterView::Init(int max_height) {
   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);
+    button_bar_ = new RichMessageCenterButtonBar(this, message_center_);
   else
-    button_bar_ = new PoorMessageCenterButtonBar(this, message_center);
+    button_bar_ = new PoorMessageCenterButtonBar(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);
   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());
 
-  if (initially_settings_visible)
+  if (settings_visible_)
     scroller_->SetVisible(false);
   else
     settings_view_->SetVisible(false);
 
   AddChildView(scroller_);
   AddChildView(settings_view_);
   AddChildView(button_bar_);
 }
 
-MessageCenterView::~MessageCenterView() {
-  message_center_->RemoveObserver(this);
-}
-
 void MessageCenterView::SetNotifications(
     const NotificationList::Notifications& notifications)  {
   message_views_.clear();
   int index = 0;
   for (NotificationList::Notifications::const_iterator iter =
            notifications.begin(); iter != notifications.end();
        ++iter, ++index) {
     AddNotificationAt(*(*iter), index);
     if (message_views_.size() >= kMaxVisibleMessageCenterNotifications)
       break;
@@ skipping 218 matching lines @@
       view->set_scroller(scroller_);
       message_list_view_->UpdateNotificationAt(view, index);
       message_views_[index] = view;
       NotificationsChanged();
       break;
     }
   }
 }
 
 void MessageCenterView::AnimationEnded(const ui::Animation* animation) {
-  DCHECK_EQ(animation, settings_transition_animation_.get());
-
-  source_view_->SetVisible(false);
-  target_view_->SetVisible(true);
-  if (source_view_->layer())
-    source_view_->layer()->SetOpacity(1.0);
-  if (target_view_->layer())
-    target_view_->layer()->SetOpacity(1.0);
-  settings_transition_animation_.reset();
-  PreferredSizeChanged();
-  Layout();
+  if (animation == settings_transition_animation_.get()) {
+    source_view_->SetVisible(false);
+    target_view_->SetVisible(true);
+    if (source_view_->layer())
+      source_view_->layer()->SetOpacity(1.0);
+    if (target_view_->layer())
+      target_view_->layer()->SetOpacity(1.0);
+    settings_transition_animation_.reset();
+    PreferredSizeChanged();
+    Layout();
+  }
 }
 
 void MessageCenterView::AnimationProgressed(const ui::Animation* animation) {
-  DCHECK_EQ(animation, settings_transition_animation_.get());
-  PreferredSizeChanged();
-  if (settings_transition_animation_->current_part_index() == 1 &&
-      source_view_->layer()) {
-    source_view_->layer()->SetOpacity(
-        1.0 - settings_transition_animation_->GetCurrentValue());
-    SchedulePaint();
-  } else if (settings_transition_animation_->current_part_index() == 2 &&
-             target_view_->layer()) {
-    target_view_->layer()->SetOpacity(
-        settings_transition_animation_->GetCurrentValue());
-    SchedulePaint();
+  if (animation == settings_transition_animation_.get()) {
+    PreferredSizeChanged();
+    if (settings_transition_animation_->current_part_index() == 1 &&
+        source_view_->layer()) {
+      source_view_->layer()->SetOpacity(
+          1.0 - settings_transition_animation_->GetCurrentValue());
+      SchedulePaint();
+    } else if (settings_transition_animation_->current_part_index() == 2 &&
+               target_view_->layer()) {
+      target_view_->layer()->SetOpacity(
+          settings_transition_animation_->GetCurrentValue());
+      SchedulePaint();
+    }
   }
 }
 
 void MessageCenterView::AnimationCanceled(const ui::Animation* animation) {
   DCHECK_EQ(animation, settings_transition_animation_.get());
   AnimationEnded(animation);
 }
 
 void MessageCenterView::AddNotificationAt(const Notification& notification,
                                           int index) {
@@ skipping 25 matching lines @@
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(views::View* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center