Index: chrome/browser/ui/webui/settings/about_handler.cc |
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc |
index a1a5e8c3f4d25879feabbd0e8982f35ccc6d034f..1665cb4a0999ee6a86ab0796085ab59f437e9260 100644 |
--- a/chrome/browser/ui/webui/settings/about_handler.cc |
+++ b/chrome/browser/ui/webui/settings/about_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" |
@@ -266,12 +267,11 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source, |
l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION, |
BuildBrowserVersionString())); |
- base::Time::Exploded exploded_time; |
- base::Time::Now().LocalExplode(&exploded_time); |
html_source->AddString( |
"aboutProductCopyright", |
- 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), |