Make the localized product name 'ungarbled'. ...

chrome/browser/chromeos/login/background_view.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/x11_util.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/feedback_menu_button.h"
 #include "chrome/browser/chromeos/status/language_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 "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 174 matching lines @@
   std::vector<int> params;
   params.push_back(did_paint_ ? 1 : 0);
   WmIpc::instance()->SetWindowType(
       GTK_WIDGET(GetNativeWindow()),
       WM_IPC_WINDOW_LOGIN_BACKGROUND,
       &params);
 }
 
 void BackgroundView::OnVersion(
     VersionLoader::Handle handle, std::string version) {
+  // TODO(jungshik): Is string concatenation OK here?
   std::string version_text = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
   version_text += ' ';
   version_text += l10n_util::GetStringUTF8(IDS_VERSION_FIELD_PREFIX);
   version_text += ' ';
   version_text += version;
-  os_version_label_->SetText(ASCIIToWide(version_text));
+  os_version_label_->SetText(UTF8ToWide(version_text));
 }
 
 void BackgroundView::OnBootTimes(
     BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times) {
   // TODO(davemoore) if we decide to keep these times visible we will need
   // to localize the strings.
   const char* kBootTimesNoChromeExec =
       "Boot took %.2f seconds (firmware %.2fs, kernel %.2fs, system %.2fs)";
   const char* kBootTimesChromeExec =
       "Boot took %.2f seconds "
@@ skipping 11 matching lines @@
             boot_times.chrome);
   } else {
     boot_times_text =
         StringPrintf(
             kBootTimesNoChromeExec,
             boot_times.total,
             boot_times.firmware,
             boot_times.pre_startup,
             boot_times.system);
   }
+  // Use UTF8ToWide once this string is loclized.

[tfarina, 2010/07/12 16:28:35]

nit: localized

   boot_times_label_->SetText(ASCIIToWide(boot_times_text));
 }
 
 }  // namespace chromeos