Revert 88440 - Change Chrome OS version numbers to Platform versions.

chrome/browser/chromeos/login/background_view.cc

 // Copyright (c) 2011 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/chromeos/login/background_view.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #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"
 #include "grit/theme_resources.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/screen.h"
 #include "views/window/window.h"
 
 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) {
   switch (step) {
     case chromeos::BackgroundView::SELECT_NETWORK:
       return IDS_OOBE_SELECT_NETWORK;
     case chromeos::BackgroundView::EULA:
       return IDS_OOBE_EULA;
     case chromeos::BackgroundView::SIGNIN:
       return IDS_OOBE_SIGNIN;
@@ skipping 272 matching lines @@
     boot_times_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     boot_times_label_->SetColor(kVersionColor);
     boot_times_label_->SetFont(rb.GetFont(ResourceBundle::SmallFont));
     if (idx < 0)
       AddChildView(boot_times_label_);
     else
       AddChildViewAt(boot_times_label_, idx);
   }
 
   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_) {
       boot_times_loader_.GetBootTimes(
           &boot_times_consumer_,
           NewCallback(this, &BackgroundView::OnBootTimes));
     }
   } else {
     UpdateVersionLabel();
   }
@@ skipping 42 matching lines @@
 void BackgroundView::UpdateVersionLabel() {
   if (!CrosLibrary::Get()->EnsureLoaded()) {
     os_version_label_->SetText(
         ASCIIToWide(CrosLibrary::Get()->load_error_string()));
     return;
   }
 
   if (version_text_.empty())
     return;
 
-  chrome::VersionInfo version_info;
-  std::string label_text = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
+  // TODO(jungshik): Is string concatenation OK here?
+  std::string label_text = l10n_util::GetStringUTF8(IDS_PRODUCT_OS_NAME);
   label_text += ' ';
-  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 += l10n_util::GetStringUTF8(IDS_VERSION_FIELD_PREFIX);
   label_text += ' ';
   label_text += version_text_;
-  label_text += ')';
 
   if (!enterprise_domain_text_.empty()) {
     label_text += ' ';
     if (enterprise_status_text_.empty()) {
       label_text += l10n_util::GetStringFUTF8(
           IDS_LOGIN_MANAGED_BY_LABEL_FORMAT,
           UTF8ToUTF16(enterprise_domain_text_));
     } else {
       label_text += l10n_util::GetStringFUTF8(
           IDS_LOGIN_MANAGED_BY_WITH_STATUS_LABEL_FORMAT,
@@ skipping 86 matching lines @@
   boot_times_label_->SetText(ASCIIToWide(boot_times_text));
 }
 
 void BackgroundView::OnPolicyStateChanged(
     policy::CloudPolicySubsystem::PolicySubsystemState state,
     policy::CloudPolicySubsystem::ErrorDetails error_details) {
   UpdateEnterpriseInfo();
 }
 
 }  // namespace chromeos