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

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

Issue 1861813003: Display device specific up to date message on chromebook. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/app/google_chrome_strings.grd ('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 dfbcbd3ee6980ae043ebf8f9b87078b69c775581..115d923f0a313319309d276d0edfccc4bad56c46 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc
@@ -8,6 +8,7 @@
#include <string>
+#include "ash/system/chromeos/devicetype_utils.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
@@ -236,7 +237,6 @@ void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) {
#endif
{"productName", IDS_PRODUCT_NAME},
{"updateCheckStarted", IDS_UPGRADE_CHECK_STARTED},
- {"upToDate", IDS_UPGRADE_UP_TO_DATE},
{"updating", IDS_UPGRADE_UPDATING},
#if defined(OS_CHROMEOS) || defined(OS_WIN)
{"updateDisabledByPolicy", IDS_UPGRADE_DISABLED_BY_POLICY},
@@ -301,6 +301,14 @@ void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) {
l10n_util::GetStringUTF16(resources[i].ids));
}
+#if defined(OS_CHROMEOS)
+ localized_strings->SetString("upToDate", ash::SubstituteChromeOSDeviceType(
+ IDS_UPGRADE_UP_TO_DATE));
+#else
+ localized_strings->SetString("upToDate", l10n_util::GetStringUTF16(
+ IDS_UPGRADE_UP_TO_DATE));
+#endif
+
localized_strings->SetString("updateObsoleteSystem",
ObsoleteSystem::LocalizedObsoleteString());
localized_strings->SetString("updateObsoleteSystemURL",
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698