improve translateability of some OOBE strings

chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc

 // Copyright (c) 2012 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/chromeos/login/update_screen_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "grit/chromium_strings.h"
@@ skipping 14 matching lines @@
       show_on_init_(false) {
 }
 
 UpdateScreenHandler::~UpdateScreenHandler() {
   if (screen_)
     screen_->OnActorDestroyed(this);
 }
 
 void UpdateScreenHandler::DeclareLocalizedValues(
     LocalizedValuesBuilder* builder) {
-  builder->AddF("checkingForUpdatesMsg",
-                IDS_CHECKING_FOR_UPDATE_MSG, IDS_SHORT_PRODUCT_NAME);
-  builder->AddF("installingUpdateDesc",
-                IDS_UPDATE_MSG, IDS_SHORT_PRODUCT_NAME);
-
+  builder->Add("checkingForUpdatesMsg", IDS_CHECKING_FOR_UPDATE_MSG);
+  builder->Add("installingUpdateDesc", IDS_UPDATE_MSG);
   builder->Add("updateScreenTitle", IDS_UPDATE_SCREEN_TITLE);
   builder->Add("updateScreenAccessibleTitle",
                IDS_UPDATE_SCREEN_ACCESSIBLE_TITLE);
   builder->Add("checkingForUpdates", IDS_CHECKING_FOR_UPDATES);
   builder->Add("downloading", IDS_DOWNLOADING);
   builder->Add("downloadingTimeLeftLong", IDS_DOWNLOADING_TIME_LEFT_LONG);
   builder->Add("downloadingTimeLeftStatusOneHour",
                IDS_DOWNLOADING_TIME_LEFT_STATUS_ONE_HOUR);
   builder->Add("downloadingTimeLeftStatusMinutes",
                IDS_DOWNLOADING_TIME_LEFT_STATUS_MINUTES);
@@ skipping 50 matching lines @@
 
 void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) {
   CallJS("setEstimatedTimeLeft", time.InSecondsF());
 }
 
 void UpdateScreenHandler::ShowProgressMessage(bool visible) {
   CallJS("showProgressMessage", visible);
 }
 
 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
-  scoped_ptr<base::StringValue> progress_message;
+  int ids = 0;
   switch (message) {
     case PROGRESS_MESSAGE_UPDATE_AVAILABLE:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringUTF16(IDS_UPDATE_AVAILABLE)));
+      ids = IDS_UPDATE_AVAILABLE;
       break;
     case PROGRESS_MESSAGE_INSTALLING_UPDATE:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringFUTF16(IDS_INSTALLING_UPDATE,
-            l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))));
+      ids = IDS_INSTALLING_UPDATE;
       break;
     case PROGRESS_MESSAGE_VERIFYING:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringUTF16(IDS_UPDATE_VERIFYING)));
+      ids = IDS_UPDATE_VERIFYING;
       break;
     case PROGRESS_MESSAGE_FINALIZING:
-      progress_message.reset(base::Value::CreateStringValue(
-          l10n_util::GetStringUTF16(IDS_UPDATE_FINALIZING)));
+      ids = IDS_UPDATE_FINALIZING;
       break;
     default:
       NOTREACHED();
-  };
-  if (progress_message.get())
-    CallJS("setProgressMessage", *progress_message);
+      return;
+  }
+
+  CallJS("setProgressMessage", l10n_util::GetStringUTF16(ids));
 }
 
 void UpdateScreenHandler::ShowCurtain(bool visible) {
   CallJS("showUpdateCurtain", visible);
 }
 
 void UpdateScreenHandler::RegisterMessages() {
 #if !defined(OFFICIAL_BUILD)
   AddCallback("cancelUpdate", &UpdateScreenHandler::HandleUpdateCancel);
 #endif
 }
 
 void UpdateScreenHandler::OnConnectToNetworkRequested(
     const std::string& service_path) {
   if (screen_)
     screen_->OnConnectToNetworkRequested(service_path);
 }
 
 #if !defined(OFFICIAL_BUILD)
 void UpdateScreenHandler::HandleUpdateCancel() {
   screen_->CancelUpdate();
 }
 #endif
 
 }  // namespace chromeos