Hide icons in message center on lock screen

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 603 matching lines @@
 
 void MessageCenterView::UpdateButtonBarStatus() {
   // Disables all buttons during animation of cleaning of all notifications.
   if (is_clearing_) {
     button_bar_->SetSettingsAndQuietModeButtonsEnabled(false);
     button_bar_->SetCloseAllButtonEnabled(false);
     return;
   }
 
   button_bar_->SetBackArrowVisible(mode_ == Mode::SETTINGS);
-  button_bar_->SetSettingsAndQuietModeButtonsEnabled(!is_locked_);
+  button_bar_->SetButtonsVisible(!is_locked_);
   button_bar_->SetTitle(GetButtonBarTitle());
 
+  // Skips the followings if the screen is locked and the buttons are hidden.
+  if (is_locked_)

[dewittj, 2017/01/12 18:29:57]

nit: This seems somewwhat fragile to future updates as-is, perhaps you could do
a small helper function like:

if (!is_locked_)
  EnableCloseAllIfAppropriate();

then the early return would not be necessary.

+    return;
+
   if (mode_ == Mode::NOTIFICATIONS) {
     bool no_closable_views = true;
     for (const auto& view : notification_views_) {
       if (!view.second->IsPinned()) {
         no_closable_views = false;
         break;
       }
     }
     button_bar_->SetCloseAllButtonEnabled(!no_closable_views);
   } else {
     // Disable the close-all button since no notification is visible.
     button_bar_->SetCloseAllButtonEnabled(false);
   }
 }
 
 void MessageCenterView::SetNotificationViewForTest(MessageView* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center