| Index: chrome/browser/ui/webui/help/help_utils_chromeos.cc
|
| diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
|
| index 95bb156f4f422630a735bab9c8b7c8b17f7b3f72..9d543020660a61fe88885368075349818853f25b 100644
|
| --- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc
|
| +++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
|
| @@ -4,11 +4,11 @@
|
|
|
| #include "chrome/browser/ui/webui/help/help_utils_chromeos.h"
|
|
|
| -#include <algorithm>
|
| -
|
| #include "base/logging.h"
|
| +#include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| +#include "chrome/common/chrome_version_info.h"
|
| #include "chromeos/network/network_type_pattern.h"
|
| #include "chromeos/settings/cros_settings_names.h"
|
| #include "grit/chromium_strings.h"
|
| @@ -64,4 +64,27 @@ base::string16 GetConnectionTypeAsUTF16(const std::string& type) {
|
| return base::string16();
|
| }
|
|
|
| +base::string16 BuildBrowserVersionString() {
|
| + chrome::VersionInfo version_info;
|
| + DCHECK(version_info.is_valid());
|
| +
|
| + std::string browser_version = version_info.Version();
|
| + std::string version_modifier =
|
| + chrome::VersionInfo::GetVersionStringModifier();
|
| + if (!version_modifier.empty())
|
| + browser_version += " " + version_modifier;
|
| +
|
| +#if !defined(GOOGLE_CHROME_BUILD)
|
| + browser_version += " (";
|
| + browser_version += version_info.LastChange();
|
| + browser_version += ")";
|
| +#endif
|
| +
|
| +#if defined(ARCH_CPU_64_BITS)
|
| + browser_version += " (64-bit)";
|
| +#endif
|
| +
|
| + return base::UTF8ToUTF16(browser_version);
|
| +}
|
| +
|
| } // namespace help_utils_chromeos
|
|
|