Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Unified Diff: chrome/browser/ui/webui/help/help_handler.cc

Issue 2712213002: Remove notification and message for security-only state (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/eol_notification.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/help/help_handler.cc
diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index 0b8879ca1f373fb40bbd54a6423a249320b32eed..fd47ef591d9d351a0474fd9b991aaf2d931960b5 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -198,17 +198,6 @@ std::string ReadRegulatoryLabelText(const base::FilePath& path) {
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
@@ -754,7 +743,8 @@ void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) {
}
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 ||
IsEnterpriseManaged()) {
return;
}
@@ -764,10 +754,9 @@ void HelpHandler::OnEolStatus(update_engine::EndOfLifeStatus status) {
"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)));
}
}
« no previous file with comments | « chrome/browser/chromeos/eol_notification.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698