Implement Non-Closable Notification

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/macros.h"
@@ skipping 237 matching lines @@
   }
   settings_transition_animation_.reset(new gfx::MultiAnimation(
       parts, base::TimeDelta::FromMicroseconds(1000000 / kDefaultFrameRateHz)));
   settings_transition_animation_->set_delegate(this);
   settings_transition_animation_->set_continuous(false);
   settings_transition_animation_->Start();
 
   button_bar_->SetBackArrowVisible(visible);
 }
 
-void MessageCenterView::ClearAllNotifications() {
+void MessageCenterView::ClearAllClosableNotifications() {
   if (is_closing_)
     return;
 
   SetViewHierarchyEnabled(scroller_, false);
   button_bar_->SetAllButtonsEnabled(false);
-  message_list_view_->ClearAllNotifications(scroller_->GetVisibleRect());
+  message_list_view_->ClearAllClosableNotifications(
+      scroller_->GetVisibleRect());
 }
 
 void MessageCenterView::OnAllNotificationsCleared() {
   SetViewHierarchyEnabled(scroller_, true);
   button_bar_->SetAllButtonsEnabled(true);
   button_bar_->SetCloseAllButtonEnabled(false);
-  message_center_->RemoveAllVisibleNotifications(true);  // Action by user.
+
+  // Action by user.
+  message_center_->RemoveAllNotifications(
+      true /* by_ser */, message_center::MessageCenter::RemoveType::CLOSABLE);

[dewittj, 2016/02/08 18:02:34]

nit: by_user

[yoshiki, 2016/02/09 23:42:25]

Done.

 }
 
 size_t MessageCenterView::NumMessageViewsForTest() const {
   return message_list_view_->child_count();
 }
 
 void MessageCenterView::OnSettingsChanged() {
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
@@ skipping 299 matching lines @@
   View* focused_view = NULL;
   // |focus_manager| can be NULL in tests.
   if (focus_manager)
     focused_view = focus_manager->GetFocusedView();
 
   // All the children of this view are owned by |this|.
   scroller_->contents()->RemoveAllChildViews(/*delete_children=*/false);
   scroller_->contents()->AddChildView(
       no_message_views ? empty_list_view_.get() : message_list_view_.get());
 
-  button_bar_->SetCloseAllButtonEnabled(!no_message_views);
+  bool no_closable_views = true;
+  for (const auto& view : notification_views_) {
+    if (view.second->IsClosable()) {
+      no_closable_views = false;
+      break;
+    }
+  }
+  button_bar_->SetCloseAllButtonEnabled(!no_closable_views);
   scroller_->SetFocusable(!no_message_views);
 
   if (focus_manager && focused_view)
     focus_manager->SetFocusedView(focused_view);
 
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(MessageView* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center