Change web notifications to show at the top of the list, clean up layout.

ash/system/web_notification/web_notification_tray.cc

 // 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.
 
 #include "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 25 matching lines @@
 const int kTrayContainerVerticalPaddingVerticalAlignment = 1;
 const int kTrayContainerHorizontalPaddingVerticalAlignment = 0;
 const int kPaddingFromLeftEdgeOfSystemTrayBottomAlignment = 8;
 const int kPaddingFromTopEdgeOfSystemTrayVerticalAlignment = 10;
 const int kNotificationImageIconWidth = 40;
 const int kNotificationImageIconHeight = 25;
 const int kNotificationImageIconInset = 4;
 
 // Web Notification Bubble constants
 const int kWebNotificationBubbleMinHeight = 80;
-const int kWebNotificationBubbleMaxHeight = 400;
+const int kWebNotificationBubbleMaxHeight = 480;
 // Delay laying out the Bubble until all notifications have been added and icons
 // have had a chance to load.
 const int kUpdateDelayMs = 50;
 // Limit the number of visible notifications.
 const int kMaxVisibleNotifications = 100;
 
 // Individual notifications constants
-const int kWebNotificationWidth = 400;
+const int kWebNotificationWidth = 320;
 const int kWebNotificationButtonWidth = 32;
 const int kWebNotificationIconSize = 40;
 
 // Menu constants
 const int kTogglePermissionCommand = 0;
 const int kToggleExtensionCommand = 1;
 const int kShowSettingsCommand = 2;
 
 // The image has three icons: 1 notifiaction, 2 notifications, and 3+.
 gfx::ImageSkia GetNotificationImage(int notification_count) {
@@ skipping 52 matching lines @@
                        const string16& display_source,
                        const std::string& extension_id) {
     Notifications::iterator iter = GetNotification(id);
     if (iter != notifications_.end()) {
       // Update existing notification.
       iter->title = title;
       iter->message = message;
       iter->display_source = display_source;
       iter->extension_id = extension_id;
     } else {
-      notifications_.push_back(
+      notifications_.push_front(
           WebNotification(id, title, message, display_source, extension_id));
     }
   }
 
   void UpdateNotificationMessage(const std::string& id,
                                  const string16& title,
                                  const string16& message) {
     Notifications::iterator iter = GetNotification(id);
     if (iter == notifications_.end())
       return;
@@ skipping 197 matching lines @@
         !notification.display_source.empty()) {
       menu_button_ = new views::MenuButton(NULL, string16(), this, true);
       menu_button_->set_border(views::Border::CreateEmptyBorder(0, 0, 0, 2));
     }
 
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
 
-    columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal/2);
+    int padding_width = kTrayPopupPaddingHorizontal/2;
+    columns->AddPaddingColumn(0, padding_width);
 
     // Notification Icon.
     columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
                        0, /* resize percent */
                        views::GridLayout::FIXED,
                        kWebNotificationIconSize, kWebNotificationIconSize);
 
-    columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal/2);
+    columns->AddPaddingColumn(0, padding_width);
 
     // Notification message text.
+    int message_width = kWebNotificationWidth - kWebNotificationIconSize -
+        kWebNotificationButtonWidth - (padding_width * 3);
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::LEADING,
                        100, /* resize percent */
-                       views::GridLayout::USE_PREF, 0, 0);
+                       views::GridLayout::FIXED, message_width, message_width);
 
-    columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal/2);
+    columns->AddPaddingColumn(0, padding_width);
 
     // Close and menu buttons.
     columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
                        0, /* resize percent */
                        views::GridLayout::FIXED,
                        kWebNotificationButtonWidth,
                        kWebNotificationButtonWidth);
 
     // Layout rows
     layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
@@ skipping 121 matching lines @@
     set_border(views::Border::CreateSolidSidedBorder(
         1, 1, 1, 1, ash::kBorderDarkColor));
 
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
     scroll_content_ = new views::View;
     scroll_content_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
+
     scroller_ = new internal::FixedSizedScrollView;
     scroller_->SetContentsView(scroll_content_);
     AddChildView(scroller_);
 
     button_view_ = new internal::WebNotificationButtonView(tray);
     AddChildView(button_view_);
   }
 
   void Update(const WebNotificationList::Notifications& notifications) {
     scroll_content_->RemoveAllChildViews(true);
-    int num_children = notifications.size();
-    WebNotificationList::Notifications::const_iterator iter =
-        notifications.begin();
-    if (num_children > kMaxVisibleNotifications) {
-      std::advance(iter, num_children - kMaxVisibleNotifications);
-      num_children = kMaxVisibleNotifications;
-    }
-    for (; iter != notifications.end(); ++iter) {
+    int num_children = 0;
+    for (WebNotificationList::Notifications::const_iterator iter =
+             notifications.begin(); iter != notifications.end(); ++iter) {
       WebNotificationView* view = new WebNotificationView(tray_, *iter);
       scroll_content_->AddChildView(view);
+      if (++num_children >= kMaxVisibleNotifications)
+        break;
     }
-    // Layout this first to set the preferred size of the scroller.
-    PreferredSizeChanged();
-    Layout();
-    // Now layout the widget with this correctly sized.
-    PreferredSizeChanged();
-    GetWidget()->GetRootView()->Layout();
+    SizeScrollContent();
     GetWidget()->GetRootView()->SchedulePaint();
-
-    // Scroll to show the most recent notification.
-    if (num_children > 0) {
-      scroll_content_->ScrollRectToVisible(
-          scroll_content_->child_at(num_children - 1)->bounds());
-    }
-  }
-
-  // Overridden from views::View:
-  virtual void Layout() OVERRIDE {
-    SizeScrollContent();
-    views::View::Layout();
   }
 
  private:
   void SizeScrollContent() {
     gfx::Size scroll_size = scroll_content_->GetPreferredSize();
     int button_height = button_view_->GetPreferredSize().height();
     int scroll_height = std::min(
         std::max(scroll_size.height(),
                  kWebNotificationBubbleMinHeight - button_height),
         kWebNotificationBubbleMaxHeight - button_height);
-    if (scroll_height < scroll_size.height()) {
-      scroll_size.set_height(scroll_height);
-      scroller_->SetFixedSize(scroll_size);
-    } else {
-      scroller_->SetFixedSize(gfx::Size());
-    }
-    scroller_->InvalidateLayout();
+    scroll_size.set_height(scroll_height);
+    scroller_->SetFixedSize(scroll_size);
+    scroller_->SizeToPreferredSize();
   }
 
   WebNotificationTray* tray_;
   internal::FixedSizedScrollView* scroller_;
   views::View* scroll_content_;
   internal::WebNotificationButtonView* button_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleContentsView);
 };
 
@@ skipping 83 matching lines @@
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
     CHECK_EQ(bubble_widget_, widget);
     bubble_widget_ = NULL;
     tray_->HideBubble();  // Will destroy |this|.
   }
 
  private:
   void UpdateBubbleView() {
     contents_view_->Update(tray_->notification_list()->notifications());
     bubble_view_->Show();
+    bubble_view_->UpdateBubble();
   }
 
   WebNotificationTray* tray_;
   internal::TrayBubbleView* bubble_view_;
   views::Widget* bubble_widget_;
   BubbleContentsView* contents_view_;
   base::WeakPtrFactory<Bubble> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Bubble);
 };
@@ skipping 138 matching lines @@
 }
 
 void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   SetTrayContainerBorder();
   SetBorder();
   tray_container_->SetLayoutManager(new views::BoxLayout(
       alignment == SHELF_ALIGNMENT_BOTTOM ?
           views::BoxLayout::kHorizontal : views::BoxLayout::kVertical,
       0, 0, 0));
+  // Destroy any existing bubble so that it will be rebuilt correctly.
+  bubble_.reset();
 }
 
 bool WebNotificationTray::PerformAction(const views::Event& event) {
   if (bubble()) {
     status_area_widget_->HideWebNotificationBubble();
   } else {
     status_area_widget_->ShowWebNotificationBubble(
         internal::StatusAreaWidget::USER_ACTION);
   }
   return true;
@@ skipping 57 matching lines @@
   UpdateIcon();
   if (!bubble())
     return;
   if (GetNotificationCount() == 0)
     status_area_widget_->HideWebNotificationBubble();
   else
     bubble_->ScheduleUpdate();
 }
 
 }  // namespace ash