| Index: ash/common/system/tray/system_tray_bubble.cc
|
| diff --git a/ash/common/system/tray/system_tray_bubble.cc b/ash/common/system/tray/system_tray_bubble.cc
|
| index c08e00e60430eed4b30a34f263cdbc241a9103bc..1d0e15352da669998f8d0c4cb66d5bcc720d2c3a 100644
|
| --- a/ash/common/system/tray/system_tray_bubble.cc
|
| +++ b/ash/common/system/tray/system_tray_bubble.cc
|
| @@ -90,7 +90,6 @@ SystemTrayBubble::~SystemTrayBubble() {
|
| void SystemTrayBubble::UpdateView(
|
| const std::vector<ash::SystemTrayItem*>& items,
|
| BubbleType bubble_type) {
|
| - DCHECK(bubble_type != BUBBLE_TYPE_NOTIFICATION);
|
|
|
| std::unique_ptr<ui::Layer> scoped_layer;
|
| if (bubble_type != bubble_type_) {
|
| @@ -196,8 +195,6 @@ void SystemTrayBubble::InitView(views::View* anchor,
|
| if (bubble_type_ == BUBBLE_TYPE_DETAILED &&
|
| init_params->max_height < GetDetailedBubbleMaxHeight()) {
|
| init_params->max_height = GetDetailedBubbleMaxHeight();
|
| - } else if (bubble_type_ == BUBBLE_TYPE_NOTIFICATION) {
|
| - init_params->close_on_deactivate = false;
|
| }
|
|
|
| bubble_view_ = TrayBubbleView::Create(anchor, tray_, init_params);
|
| @@ -237,9 +234,6 @@ void SystemTrayBubble::DestroyItemViews() {
|
| case BUBBLE_TYPE_DETAILED:
|
| (*it)->DestroyDetailedView();
|
| break;
|
| - case BUBBLE_TYPE_NOTIFICATION:
|
| - (*it)->DestroyNotificationView();
|
| - break;
|
| }
|
| }
|
| }
|
| @@ -340,9 +334,6 @@ void SystemTrayBubble::CreateItemViews(LoginStatus login_status) {
|
| case BUBBLE_TYPE_DETAILED:
|
| item_view = items_[i]->CreateDetailedView(login_status);
|
| break;
|
| - case BUBBLE_TYPE_NOTIFICATION:
|
| - item_view = items_[i]->CreateNotificationView(login_status);
|
| - break;
|
| }
|
| if (item_view) {
|
| TrayPopupItemContainer* tray_popup_item_container =
|
|
|