| 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 b9b6f169bea411b0aca7ae2bec12c372c34ce2c8..983febf83103e6eaca54ee0a24ad0a3166974037 100644
|
| --- a/ui/message_center/views/message_center_view.cc
|
| +++ b/ui/message_center/views/message_center_view.cc
|
| @@ -54,13 +54,6 @@ const int kAnimateClearingNextNotificationDelayMS = 40;
|
|
|
| const int kDefaultAnimationDurationMs = 120;
|
| const int kDefaultFrameRateHz = 60;
|
| -
|
| -void SetViewHierarchyEnabled(views::View* view, bool enabled) {
|
| - for (int i = 0; i < view->child_count(); i++)
|
| - SetViewHierarchyEnabled(view->child_at(i), enabled);
|
| - view->SetEnabled(enabled);
|
| -}
|
| -
|
| } // namespace
|
|
|
| class NoNotificationMessageView : public views::View {
|
| @@ -692,13 +685,13 @@ void MessageCenterView::ClearAllNotifications() {
|
| if (is_closing_)
|
| return;
|
|
|
| - SetViewHierarchyEnabled(scroller_, false);
|
| + scroller_->SetEnabled(false);
|
| button_bar_->SetAllButtonsEnabled(false);
|
| message_list_view_->ClearAllNotifications(scroller_->GetVisibleRect());
|
| }
|
|
|
| void MessageCenterView::OnAllNotificationsCleared() {
|
| - SetViewHierarchyEnabled(scroller_, true);
|
| + scroller_->SetEnabled(true);
|
| button_bar_->SetAllButtonsEnabled(true);
|
| button_bar_->SetCloseAllButtonEnabled(false);
|
| message_center_->RemoveAllVisibleNotifications(true); // Action by user.
|
| @@ -870,13 +863,12 @@ void MessageCenterView::OnNotificationRemoved(const std::string& id,
|
| next_focused_view = message_list_view_->child_at(index - 1);
|
|
|
| if (next_focused_view) {
|
| - if (view->IsCloseButtonFocused()) {
|
| + if (view->IsCloseButtonFocused())
|
| // Safe cast since all views in MessageListView are MessageViews.
|
| static_cast<MessageView*>(
|
| next_focused_view)->RequestFocusOnCloseButton();
|
| - } else {
|
| + else
|
| next_focused_view->RequestFocus();
|
| - }
|
| }
|
| }
|
| }
|
|
|