Message center re-organized

ui/message_center/views/message_center_view.cc

Index: ui/message_center/views/message_center_view.cc
diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc
index cd01ff986ac08fdd858f1b494f03f2b4edb81faf..bbe21f1e4bbc0a47e8c4fbf9ef22ff27587dbc1d 100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -842,20 +842,26 @@ void MessageCenterButtonBar::SetCloseAllVisible(bool visible) {
 
 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,
@@ -879,7 +885,7 @@ MessageCenterView::MessageCenterView(MessageCenter* message_center,
   settings_view_ = new NotifierSettingsView(
       message_center_->GetNotifierSettingsProvider());
 
-  if (initially_settings_visible)
+  if (settings_visible_)
     scroller_->SetVisible(false);
   else
     settings_view_->SetVisible(false);
@@ -889,10 +895,6 @@ MessageCenterView::MessageCenterView(MessageCenter* message_center,
   AddChildView(button_bar_);
 }
 
-MessageCenterView::~MessageCenterView() {
-  message_center_->RemoveObserver(this);
-}
-
 void MessageCenterView::SetNotifications(
     const NotificationList::Notifications& notifications)  {
   message_views_.clear();
@@ -1131,32 +1133,33 @@ void MessageCenterView::OnNotificationUpdated(const std::string& id) {
 }
 
 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();
+    }
   }
 }