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 0db3e352833b9aa450535110bde2b0238eb3ba2d..aee913133542d8295ac841b33bc57de5217a5f5c 100644 |
--- a/chrome/browser/ui/webui/help/help_handler.cc |
+++ b/chrome/browser/ui/webui/help/help_handler.cc |
@@ -14,13 +14,14 @@ |
#include "base/command_line.h" |
#include "base/files/file_path.h" |
#include "base/files/file_util.h" |
+#include "base/i18n/message_formatter.h" |
#include "base/location.h" |
#include "base/macros.h" |
#include "base/strings/string16.h" |
-#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/task_runner_util.h" |
+#include "base/time/time.h" |
#include "base/values.h" |
#include "build/build_config.h" |
#include "chrome/browser/browser_process.h" |
@@ -320,12 +321,11 @@ void HelpHandler::GetLocalizedValues(base::DictionaryValue* localized_strings) { |
l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION, |
BuildBrowserVersionString())); |
- base::Time::Exploded exploded_time; |
- base::Time::Now().LocalExplode(&exploded_time); |
localized_strings->SetString( |
"productCopyright", |
- l10n_util::GetStringFUTF16(IDS_ABOUT_VERSION_COPYRIGHT, |
- base::IntToString16(exploded_time.year))); |
+ base::i18n::MessageFormatter::FormatWithNumberedArgs( |
+ l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT), |
+ base::Time::Now())); |
base::string16 license = l10n_util::GetStringFUTF16( |
IDS_VERSION_UI_LICENSE, base::ASCIIToUTF16(chrome::kChromiumProjectURL), |