Remove notification and message for security-only state

chrome/browser/chromeos/eol_notification.cc

 // Copyright 2016 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 "chrome/browser/chromeos/eol_notification.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 98 matching lines @@
       base::Bind(&EolNotification::OnEolStatus, weak_factory_.GetWeakPtr()));
 }
 
 void EolNotification::OnEolStatus(update_engine::EndOfLifeStatus status) {
   status_ = status;
 
   const int pre_eol_status =
       profile_->GetPrefs()->GetInteger(prefs::kEolStatus);
   profile_->GetPrefs()->SetInteger(prefs::kEolStatus, status_);
 
-  if (status_ == update_engine::EndOfLifeStatus::kSupported)
+  // Security only state is no longer supported.
+  if (status_ == update_engine::EndOfLifeStatus::kSupported ||
+      status_ == update_engine::EndOfLifeStatus::kSecurityOnly) {
     return;
+  }
 
   if (pre_eol_status != status_) {
     // If Eol status has changed, we should reset
     // kEolNotificationDismissed and show notification.
     profile_->GetPrefs()->SetBoolean(prefs::kEolNotificationDismissed, false);
   }
 
   bool user_dismissed_eol_notification =
       profile_->GetPrefs()->GetBoolean(prefs::kEolNotificationDismissed);
   if (user_dismissed_eol_notification)
     return;
 
-  // When device is in Security-Only state, only show notification the first
-  // time.
-  if (status_ == update_engine::EndOfLifeStatus::kSecurityOnly)
-    profile_->GetPrefs()->SetBoolean(prefs::kEolNotificationDismissed, true);
-
   Update();
 }
 
 void EolNotification::Update() {
   message_center::ButtonInfo learn_more(
       l10n_util::GetStringUTF16(IDS_EOL_MORE_INFO_BUTTON));
   learn_more.icon = gfx::Image(
       CreateVectorIcon(gfx::VectorIconId::INFO_OUTLINE, kButtonIconColor));
   message_center::ButtonInfo dismiss(
       l10n_util::GetStringUTF16(IDS_EOL_DISMISS_BUTTON));
   dismiss.icon = gfx::Image(
       CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS_OFF, kButtonIconColor));
 
   message_center::RichNotificationData data;
   data.buttons.push_back(learn_more);
   data.buttons.push_back(dismiss);
 
   Notification notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
-      l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_TITLE), GetEolMessage(),
+      l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_TITLE),
+      l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_EOL),
       gfx::Image(
           CreateVectorIcon(gfx::VectorIconId::EOL, kNotificationIconColor)),
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  kEolNotificationId),
       base::string16(),  // display_source
       GURL(), kEolNotificationId, data, new EolNotificationDelegate(profile_));
   g_browser_process->notification_ui_manager()->Add(notification, profile_);
 }
 
-base::string16 EolNotification::GetEolMessage() {
-  if (status_ == update_engine::EndOfLifeStatus::kSecurityOnly) {
-    return l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_SECURITY_ONLY);
-  } else {
-    return l10n_util::GetStringUTF16(IDS_EOL_NOTIFICATION_EOL);
-  }
-}
-
 }  // namespace chromeos