| Index: ui/message_center/views/message_popup_collection.cc
|
| diff --git a/ui/message_center/views/message_popup_collection.cc b/ui/message_center/views/message_popup_collection.cc
|
| index 5355ad6962b5ceae2a5bff83d259546708d13cef..0e905e5747ab9b6429c296f824b9b0ac405a654d 100644
|
| --- a/ui/message_center/views/message_popup_collection.cc
|
| +++ b/ui/message_center/views/message_popup_collection.cc
|
| @@ -19,6 +19,7 @@
|
| #include "ui/gfx/screen.h"
|
| #include "ui/message_center/message_center.h"
|
| #include "ui/message_center/message_center_style.h"
|
| +#include "ui/message_center/message_center_util.h"
|
| #include "ui/message_center/notification.h"
|
| #include "ui/message_center/notification_list.h"
|
| #include "ui/message_center/views/notification_view.h"
|
| @@ -129,11 +130,14 @@ void MessagePopupCollection::UpdateWidgets() {
|
| if (FindToast((*iter)->id()))
|
| continue;
|
|
|
| + bool expanded = true;
|
| + if (IsExperimentalNotificationUIEnabled())
|
| + expanded = (*iter)->is_expanded();
|
| MessageView* view =
|
| NotificationView::Create(*(*iter),
|
| message_center_,
|
| tray_,
|
| - true, // Create expanded.
|
| + expanded,
|
| true); // Create top-level notification.
|
| int view_height = ToastContentsView::GetToastSizeForView(view).height();
|
| int height_available = top_down ? work_area_.bottom() - base : base;
|
| @@ -412,11 +416,14 @@ void MessagePopupCollection::OnNotificationUpdated(
|
| if ((*iter)->id() != notification_id)
|
| continue;
|
|
|
| + bool expanded = true;
|
| + if (IsExperimentalNotificationUIEnabled())
|
| + expanded = (*iter)->is_expanded();
|
| MessageView* view =
|
| NotificationView::Create(*(*iter),
|
| message_center_,
|
| tray_,
|
| - true, // Create expanded.
|
| + expanded,
|
| true); // Create top-level notification.
|
| (*toast_iter)->SetContents(view);
|
| updated = true;
|
|
|