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 829 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)
+                                     bool initially_settings_visible,
+                                     bool buttons_at_top)
     : message_center_(message_center),
       tray_(tray),
+      buttons_at_top_(buttons_at_top),
       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);
@@ skipping 109 matching lines @@
   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,
+                       buttons_at_top_ ? button_height : 0,
+                       width(),
+                       height() - button_height - between_child);
+  settings_view_->SetBounds(0,
+                            buttons_at_top_ ? button_height : 0,
+                            width(),
+                            height() - button_height - between_child);
 
   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));
     button_bar_->SchedulePaint();
   } else if (!is_scrollable && button_bar_->border()) {
     button_bar_->set_border(NULL);
     button_bar_->SchedulePaint();
   }
 
-  button_bar_->SetBounds(0, height() - button_height, width(), button_height);
+  button_bar_->SetBounds(0,
+                         buttons_at_top_ ? 0 : height() - button_height,
+                         width(),
+                         button_height);
   if (GetWidget())
     GetWidget()->GetRootView()->SchedulePaint();
 }
 
 gfx::Size MessageCenterView::GetPreferredSize() {
   if (settings_transition_animation_ &&
       settings_transition_animation_->is_animating()) {
     int content_width = std::max(source_view_->GetPreferredSize().width(),
                                  target_view_->GetPreferredSize().width());
     int width = std::max(content_width,
@@ skipping 112 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()) {

[dewittj, 2013/07/02 18:43:32]

Why remove the DCHECK?

[sidharthms, 2013/07/02 21:01:16]

Done.

+    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()) {

[dewittj, 2013/07/02 18:43:32]

why remove the DCHECK?

[sidharthms, 2013/07/02 21:01:16]

Done.

+    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