Revert of Show message center on lock screen

ui/message_center/views/message_center_view.cc

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 92976fda271fea3af66ebc3b79925188ff167252..aa04936b10a7a3d68600febab84f43685d821e0c 100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -41,9 +41,6 @@
 
 namespace message_center {
 
-// static
-bool MessageCenterView::disable_animation_for_testing = false;
-
 namespace {
 
 const int kDefaultAnimationDurationMs = 120;
@@ -76,9 +73,8 @@
       target_view_(NULL),
       target_height_(0),
       is_closing_(false),
-      is_locked_(message_center_->IsLockedState()),
-      mode_((!initially_settings_visible || is_locked_) ? Mode::BUTTONS_ONLY
-                                                        : Mode::SETTINGS),
+      mode_((!initially_settings_visible) ? Mode::BUTTONS_ONLY
+                                          : Mode::SETTINGS),
       context_menu_controller_(new MessageViewContextMenuController(this)) {
   message_center_->AddObserver(this);
   set_notify_enter_exit_on_child(true);
@@ -406,12 +402,6 @@
   }
 }
 
-void MessageCenterView::OnLockedStateChanged(bool locked) {
-  is_locked_ = locked;
-  UpdateButtonBarStatus();
-  Update(true /* animate */);
-}
-
 void MessageCenterView::ClickOnNotification(
     const std::string& notification_id) {
   message_center_->ClickOnNotification(notification_id);
@@ -498,10 +488,8 @@
 }
 
 base::string16 MessageCenterView::GetButtonBarTitle() const {
-  if (is_locked_)
-    return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_FOOTER_LOCKSCREEN);
-
-  if (mode_ == Mode::BUTTONS_ONLY)
+  bool no_message_views = notification_views_.empty();
+  if (no_message_views && !settings_visible_)
     return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_NO_MESSAGES);
 
   return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_FOOTER_TITLE);
@@ -519,9 +507,7 @@
   if (focus_manager)
     focused_view = focus_manager->GetFocusedView();
 
-  if (is_locked_)
-    SetVisibilityMode(Mode::BUTTONS_ONLY, animate);
-  else if (settings_visible_)
+  if (settings_visible_)
     SetVisibilityMode(Mode::SETTINGS, animate);
   else if (no_message_views)
     SetVisibilityMode(Mode::BUTTONS_ONLY, animate);
@@ -575,7 +561,7 @@
   source_height_ = source_view_ ? source_view_->GetHeightForWidth(width()) : 0;
   target_height_ = target_view_ ? target_view_->GetHeightForWidth(width()) : 0;
 
-  if (!animate || disable_animation_for_testing) {
+  if (!animate) {
     AnimationEnded(NULL);
     return;
   }
@@ -617,7 +603,7 @@
   }
 
   button_bar_->SetBackArrowVisible(mode_ == Mode::SETTINGS);
-  button_bar_->SetSettingsAndQuietModeButtonsEnabled(!is_locked_);
+  button_bar_->SetSettingsAndQuietModeButtonsEnabled(true);
   button_bar_->SetTitle(GetButtonBarTitle());
 
   if (mode_ == Mode::NOTIFICATIONS) {