Index: chrome/browser/chromeos/login/background_view.cc |
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc |
index 5d2eb29e681ed2e0c7cb36aa46e05f25622a38fb..89ace3881b7c1907526c3e1f8574a58a978e7ac6 100644 |
--- a/chrome/browser/chromeos/login/background_view.cc |
+++ b/chrome/browser/chromeos/login/background_view.cc |
@@ -28,6 +28,7 @@ |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/views/dom_view.h" |
#include "chrome/browser/ui/views/window.h" |
+#include "chrome/common/chrome_version_info.h" |
#include "googleurl/src/gurl.h" |
#include "grit/chromium_strings.h" |
#include "grit/generated_resources.h" |
@@ -47,6 +48,7 @@ using views::Widget; |
namespace { |
const SkColor kVersionColor = 0xff5c739f; |
+const char kPlatformLabel[] = "cros:"; |
// Returns the corresponding step id for step constant. |
int GetStepId(size_t step) { |
@@ -339,10 +341,11 @@ void BackgroundView::InitInfoLabels() { |
} |
if (CrosLibrary::Get()->EnsureLoaded()) { |
+ version_loader_.EnablePlatformVersions(true); |
version_loader_.GetVersion( |
&version_consumer_, |
NewCallback(this, &BackgroundView::OnVersion), |
- is_official_build_? |
+ is_official_build_ ? |
VersionLoader::VERSION_SHORT_WITH_DATE : |
VersionLoader::VERSION_FULL); |
if (!is_official_build_) { |
@@ -405,12 +408,18 @@ void BackgroundView::UpdateVersionLabel() { |
if (version_text_.empty()) |
return; |
- // TODO(jungshik): Is string concatenation OK here? |
- std::string label_text = l10n_util::GetStringUTF8(IDS_PRODUCT_OS_NAME); |
+ chrome::VersionInfo version_info; |
+ std::string label_text = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME); |
label_text += ' '; |
- label_text += l10n_util::GetStringUTF8(IDS_VERSION_FIELD_PREFIX); |
+ label_text += version_info.Version(); |
+ label_text += " ("; |
+ // TODO(rkc): Fix this. This needs to be in a resource file, but we have had |
+ // to put it in for merge into R12. Also, look at rtl implications for this |
+ // entire string composition code. |
+ label_text += kPlatformLabel; |
label_text += ' '; |
label_text += version_text_; |
+ label_text += ')'; |
if (!enterprise_domain_text_.empty()) { |
label_text += ' '; |