Translate: Move label parsing logic into common code.

chrome/browser/views/infobars/translate_infobars.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/views/infobars/translate_infobars.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/gfx/canvas.h"
@@ skipping 465 matching lines @@
 
 // TranslateInfoBar, views::ViewMenuDelegate implementation: -------------------
 
 void TranslateInfoBar::RunMenu(views::View* source, const gfx::Point& pt) {
   switch (source->GetID()) {
     case kMenuIDOptions: {
       if (!options_menu_model_.get()) {
         options_menu_model_.reset(new OptionsMenuModel(this, GetDelegate()));
         options_menu_menu_.reset(new views::Menu2(options_menu_model_.get()));
       }
       options_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);

[kuan, 2010/02/16 17:23:54]

i assume this is fixing RTL bug?  if it is, could you merge this cl into 249
branch?
thanks.

       break;
     }
 
     case kMenuIDOriginalLanguage: {
       if (GetDelegate()->state() != TranslateInfoBarDelegate::kTranslating) {
         if (!original_language_menu_model_.get()) {
           original_language_menu_model_.reset(
               new LanguagesMenuModel(this, GetDelegate(), true));
           original_language_menu_menu_.reset(
               new views::Menu2(original_language_menu_model_.get()));
@@ skipping 119 matching lines @@
   if (tab != GetDelegate()->tab_contents())
     return;
   UpdateState(TranslateInfoBarDelegate::kAfterTranslate);
 }
 
 // TranslateInfoBar, private: --------------------------------------------------
 
 void TranslateInfoBar::CreateLabels() {
   // Determine text for labels.
   std::vector<size_t> offsets;
-  std::wstring message_text = l10n_util::GetStringF(
-      (GetDelegate()->state() == TranslateInfoBarDelegate::kAfterTranslate ?
-          IDS_TRANSLATE_INFOBAR_AFTER_MESSAGE :
-              IDS_TRANSLATE_INFOBAR_BEFORE_MESSAGE),
-      std::wstring(), std::wstring(), &offsets);
-  if (!offsets.empty() && offsets.size() <= 2) {
-    // Sort the offsets if necessary.
-    if (offsets.size() == 2 && offsets[0] > offsets[1]) {
-      size_t offset0 = offsets[0];
-      offsets[0] = offsets[1];
-      offsets[1] = offset0;
-      swapped_language_placeholders_ = true;
-    }
-    if (offsets[offsets.size() - 1] != message_text.length())
-      offsets.push_back(message_text.length());
-  } else {
-    NOTREACHED() << "Invalid no. of placeholders in label.";
-  }
+  string16 message_text_utf16;
+  GetDelegate()->GetMessageText(&message_text_utf16, &offsets,
+      &swapped_language_placeholders_);
+
+  std::wstring message_text = UTF16ToWideHack(message_text_utf16);
 
   // Create label controls.
   const gfx::Font& font = ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::MediumFont);
   std::wstring label_1 = message_text.substr(0, offsets[0]);
   if (label_1_) {
     label_1_->SetText(label_1);
   } else {
     label_1_ = new views::Label(label_1, font);
     label_1_->SetColor(SK_ColorBLACK);
@@ skipping 93 matching lines @@
 inline int TranslateInfoBar::GetSpacingAfterFirstLanguageButton() const {
   return (GetDelegate()->state() == TranslateInfoBarDelegate::kBeforeTranslate ?
       10 : kButtonInLabelSpacing);
 }
 
 // TranslateInfoBarDelegate, InfoBarDelegate overrides: ------------------
 
 InfoBar* TranslateInfoBarDelegate::CreateInfoBar() {
   return new TranslateInfoBar(this);
 }