Remove notification and message for security-only state

chrome/browser/ui/webui/help/help_handler.cc

 // Copyright (c) 2012 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/ui/webui/help/help_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 180 matching lines @@
 std::string ReadRegulatoryLabelText(const base::FilePath& path) {
   base::FilePath text_path(chrome::kChromeOSAssetPath);
   text_path = text_path.Append(path);
   text_path = text_path.AppendASCII(kRegulatoryLabelTextFilename);
 
   std::string contents;
   if (base::ReadFileToString(text_path, &contents))
     return contents;
   return std::string();
 }
-
-// Returns messages that applys to this eol status
-base::string16 GetEolMessage(update_engine::EndOfLifeStatus status) {
-  if (status == update_engine::EndOfLifeStatus::kSecurityOnly) {
-    return l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_SECURITY_ONLY);
-
-  } else {
-    return l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL);
-  }
-}
-
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace
 
 HelpHandler::HelpHandler()
     : policy_registrar_(
         g_browser_process->policy_service(),
         policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, std::string())),
       weak_factory_(this) {
 }
@@ skipping 525 matching lines @@
 }
 
 void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) {
   // Remove unnecessary whitespace.
   web_ui()->CallJavascriptFunctionUnsafe(
       "help.HelpPage.setRegulatoryLabelText",
       base::StringValue(base::CollapseWhitespaceASCII(text, true)));
 }
 
 void HelpHandler::OnEolStatus(update_engine::EndOfLifeStatus status) {
-  if (status == update_engine::EndOfLifeStatus::kSupported ||
+  // Security only state is no longer supported.
+  if (status == update_engine::EndOfLifeStatus::kSecurityOnly ||

[xiyuan, 2017/02/27 18:02:33]

Just to confirm:
- Before the CL, we skip kSupported state on managed devices.
- After the CL, kSupported state on managed devices will fall through.

Is this intended?

       IsEnterpriseManaged()) {
     return;
   }
 
   if (status == update_engine::EndOfLifeStatus::kSupported) {
     web_ui()->CallJavascriptFunctionUnsafe(
         "help.HelpPage.updateEolMessage", base::StringValue("device_supported"),
         base::StringValue(""));
   } else {
-    base::string16 message = GetEolMessage(status);
     web_ui()->CallJavascriptFunctionUnsafe(
         "help.HelpPage.updateEolMessage", base::StringValue("device_endoflife"),
-        base::StringValue(message));
+        base::StringValue(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL)));
   }
 }
 
 #endif  // defined(OS_CHROMEOS)