Revert of Show 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 23 matching lines @@
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
 
-// static
-bool MessageCenterView::disable_animation_for_testing = false;
-
 namespace {
 
 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);
 }
@@ skipping 12 matching lines @@
       scroller_(NULL),
       settings_view_(NULL),
       button_bar_(NULL),
       top_down_(top_down),
       settings_visible_(initially_settings_visible),
       source_view_(NULL),
       source_height_(0),
       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);
   set_background(views::Background::CreateSolidBackground(
       kMessageCenterBackgroundColor));
 
   NotifierSettingsProvider* notifier_settings_provider =
       message_center_->GetNotifierSettingsProvider();
   button_bar_ = new MessageCenterButtonBar(
       this, message_center, notifier_settings_provider,
@@ skipping 307 matching lines @@
       int old_width = view->width();
       int old_height = view->GetHeightForWidth(old_width);
       message_list_view_->UpdateNotification(view, **iter);
       if (view->GetHeightForWidth(old_width) != old_height)
         Update(true /* animate */);
       break;
     }
   }
 }
 
-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);
 }
 
 void MessageCenterView::RemoveNotification(const std::string& notification_id,
                                            bool by_user) {
   message_center_->RemoveNotification(notification_id, by_user);
 }
 
@@ skipping 66 matching lines @@
                                           int index) {
   MessageView* view =
       NotificationView::Create(this, notification, false);  // Not top-level.
   view->set_context_menu_controller(context_menu_controller_.get());
   notification_views_[notification.id()] = view;
   view->set_scroller(scroller_);
   message_list_view_->AddNotificationAt(view, index);
 }
 
 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);
 }
 
 void MessageCenterView::Update(bool animate) {
   bool no_message_views = notification_views_.empty();
 
   // When the child view is removed from the hierarchy, its focus is cleared.
   // In this case we want to save which view has focus so that the user can
   // continue to interact with notifications in the order they were expecting.
   views::FocusManager* focus_manager = scroller_->GetFocusManager();
   View* focused_view = NULL;
   // |focus_manager| can be NULL in tests.
   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);
   else
     SetVisibilityMode(Mode::NOTIFICATIONS, animate);
 
   if (no_message_views) {
     scroller_->SetFocusBehavior(FocusBehavior::NEVER);
   } else {
 #if defined(OS_MACOSX)
@@ skipping 33 matching lines @@
   else if (mode == Mode::SETTINGS)
     target_view_ = settings_view_;
   else
     target_view_ = NULL;
 
   mode_ = mode;
 
   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;
   }
 
   gfx::MultiAnimation::Parts parts;
   // First part: slide resize animation.
   parts.push_back(gfx::MultiAnimation::Part(
       (source_height_ == target_height_) ? 0 : kDefaultAnimationDurationMs,
       gfx::Tween::EASE_OUT));
   // Second part: fade-out the source_view.
@@ skipping 21 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_->SetSettingsAndQuietModeButtonsEnabled(true);
   button_bar_->SetTitle(GetButtonBarTitle());
 
   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