Fix browser version string in RTL mode.

chrome/browser/ui/webui/settings/about_handler.cc

 // Copyright 2016 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/settings/about_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 245 matching lines @@
 namespace settings {
 
 AboutHandler::AboutHandler() : weak_factory_(this) {}
 
 AboutHandler::~AboutHandler() {}
 
 AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source,
                                    Profile* profile) {
   html_source->AddString(
       "aboutBrowserVersion",
-      l10n_util::GetStringFUTF16(IDS_ABOUT_PRODUCT_VERSION,
-                                 BuildBrowserVersionString()));
+      l10n_util::GetStringFUTF16(
+          IDS_SETTINGS_ABOUT_PAGE_BROWSER_VERSION,
+          base::UTF8ToUTF16(version_info::GetVersionNumber()),
+          l10n_util::GetStringUTF16(version_info::IsOfficialBuild()
+                                        ? IDS_VERSION_UI_OFFICIAL
+                                        : IDS_VERSION_UI_UNOFFICIAL),
+          base::UTF8ToUTF16(chrome::GetChannelString()),
+#if defined(ARCH_CPU_64_BITS)
+          l10n_util::GetStringUTF16(IDS_VERSION_UI_64BIT)));
+#else
+          l10n_util::GetStringUTF16(IDS_VERSION_UI_32BIT)));
+#endif
 
   html_source->AddString(
       "aboutProductCopyright",
       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),
       base::ASCIIToUTF16(chrome::kChromeUICreditsURL));
@@ skipping 111 matching lines @@
 void AboutHandler::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED, type);
 
   // A version update is installed and ready to go. Refresh the UI so the
   // correct state will be shown.
   RequestUpdate();
 }
 
-// static
-base::string16 AboutHandler::BuildBrowserVersionString() {
-  std::string version = version_info::GetVersionNumber();
-
-  std::string modifier = chrome::GetChannelString();
-  if (!modifier.empty())
-    version += " " + modifier;
-
-#if defined(ARCH_CPU_64_BITS)
-  version += " (64-bit)";

[Dan Beam, 2016/12/03 01:26:07]

ahhhh, this wasn't using IDS_VERSION_UI_{32,64}BIT

[dpapad, 2016/12/03 02:08:30]

Acknowledged.

-#endif
-
-  return base::UTF8ToUTF16(version);
-}
-
 void AboutHandler::OnDeviceAutoUpdatePolicyChanged(
     const base::Value* previous_policy,
     const base::Value* current_policy) {
   bool previous_auto_update_disabled = false;
   if (previous_policy)
     CHECK(previous_policy->GetAsBoolean(&previous_auto_update_disabled));
 
   bool current_auto_update_disabled = false;
   if (current_policy)
     CHECK(current_policy->GetAsBoolean(&current_auto_update_disabled));
@@ skipping 224 matching lines @@
   std::string url =
       std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path;
   regulatory_info->SetString("url", url);
 
   ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info);
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace settings