Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/autofill_profiles_view_win.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/autofill_profiles_view_win.h"
 
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "app/l10n_util.h"
@@ skipping 283 matching lines @@
   views::GridLayout* layout = new views::GridLayout(link_container);
   link_container->SetLayoutManager(layout);
 
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddPaddingColumn(0, kDialogPadding);
   column_set->AddColumn(views::GridLayout::LEADING,
                         views::GridLayout::LEADING, 0,
                         views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
   views::Link* link = new views::Link(
-      l10n_util::GetString(IDS_AUTOFILL_LEARN_MORE));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_AUTOFILL_LEARN_MORE)));
   link->SetController(this);
   layout->AddView(link);
 
   return link_container;
 }
 
 bool AutoFillProfilesView::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   switch (button) {
   case MessageBoxFlags::DIALOGBUTTON_OK:
   case MessageBoxFlags::DIALOGBUTTON_CANCEL:
     return true;
   default:
     break;
   }
   NOTREACHED();
   return false;
 }
 
 
 std::wstring AutoFillProfilesView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_AUTOFILL_OPTIONS_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS_TITLE));
 }
 
 void AutoFillProfilesView::WindowClosing() {
   focus_manager_->RemoveFocusChangeListener(this);
   instance_ = NULL;
 }
 
 views::View* AutoFillProfilesView::GetContentsView() {
   return this;
 }
@@ skipping 104 matching lines @@
   if (!pref_name || *pref_name == prefs::kAutoFillEnabled)
     UpdateWidgetState();
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView, private:
 void AutoFillProfilesView::Init() {
   GetData();
 
   enable_auto_fill_button_ = new views::Checkbox(
-      l10n_util::GetString(IDS_OPTIONS_AUTOFILL_ENABLE));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOFILL_ENABLE)));
   enable_auto_fill_button_->set_listener(this);
 
   table_model_.reset(new ContentListTableModel(&profiles_set_,
                                                &credit_card_set_));
   std::vector<TableColumn> columns;
   columns.push_back(TableColumn());
   scroll_view_ = new views::TableView(table_model_.get(), columns,
                                       views::TEXT_ONLY, false, true, true);
   scroll_view_->SetObserver(this);
 
   add_address_button_ = new views::NativeButton(this,
-      l10n_util::GetString(IDS_AUTOFILL_ADD_ADDRESS_BUTTON));
-  add_credit_card_button_ = new views::NativeButton(this,
-      l10n_util::GetString(IDS_AUTOFILL_ADD_CREDITCARD_BUTTON));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_AUTOFILL_ADD_ADDRESS_BUTTON)));
+  add_credit_card_button_ = new views::NativeButton(this, UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_ADD_CREDITCARD_BUTTON)));
   edit_button_ = new views::NativeButton(this,
-      l10n_util::GetString(IDS_AUTOFILL_EDIT_BUTTON));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_AUTOFILL_EDIT_BUTTON)));
   remove_button_ = new views::NativeButton(this,
-      l10n_util::GetString(IDS_AUTOFILL_DELETE_BUTTON));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_AUTOFILL_DELETE_BUTTON)));
 
   views::GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
   const int table_with_buttons_column_view_set_id = 0;
   views::ColumnSet* column_set =
       layout->AddColumnSet(table_with_buttons_column_view_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
@@ skipping 259 matching lines @@
 int AutoFillProfilesView::EditableSetViewContents::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_CANCEL |
          MessageBoxFlags::DIALOGBUTTON_OK;
 }
 
 std::wstring
 AutoFillProfilesView::EditableSetViewContents::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   switch (button) {
   case MessageBoxFlags::DIALOGBUTTON_OK:
-    return l10n_util::GetString(IDS_AUTOFILL_DIALOG_SAVE);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SAVE));
   case MessageBoxFlags::DIALOGBUTTON_CANCEL:
     return std::wstring();
   default:
     break;
   }
   NOTREACHED();
   return std::wstring();
 }
 
 bool AutoFillProfilesView::EditableSetViewContents::IsDialogButtonEnabled(
@@ skipping 45 matching lines @@
 std::wstring
 AutoFillProfilesView::EditableSetViewContents::GetWindowTitle() const {
   int string_id = 0;
   if (temporary_info_.is_address) {
     string_id = new_item_ ? IDS_AUTOFILL_ADD_ADDRESS_CAPTION :
                             IDS_AUTOFILL_EDIT_ADDRESS_CAPTION;
   } else {
     string_id = new_item_ ? IDS_AUTOFILL_ADD_CREDITCARD_CAPTION :
                             IDS_AUTOFILL_EDIT_CREDITCARD_CAPTION;
   }
-  return l10n_util::GetString(string_id);
+  return UTF16ToWide(l10n_util::GetStringUTF16(string_id));
 }
 
 void AutoFillProfilesView::EditableSetViewContents::WindowClosing() {
   observer_->ChildWindowClosed();
 }
 
 views::View* AutoFillProfilesView::EditableSetViewContents::GetContentsView() {
   return this;
 }
 
@@ skipping 109 matching lines @@
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_COMPANY_NAME));
 
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_COMPANY]);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_leading_view_set_id_);
-  layout->AddView(new views::Label(l10n_util::GetString(
-                  IDS_AUTOFILL_DIALOG_ADDRESS_LINE_1)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+                  IDS_AUTOFILL_DIALOG_ADDRESS_LINE_1))));
 
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_ADDRESS_LINE_1]);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, double_column_leading_view_set_id_);
-  layout->AddView(new views::Label(l10n_util::GetString(
-                  IDS_AUTOFILL_DIALOG_ADDRESS_LINE_2)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+                  IDS_AUTOFILL_DIALOG_ADDRESS_LINE_2))));
 
   layout->StartRow(0, double_column_fill_view_set_id_);
   layout->AddView(text_fields_[TEXT_ADDRESS_LINE_2]);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, triple_column_fill_view_set_id_);
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_CITY));
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_STATE));
   layout->AddView(CreateLeftAlignedLabel(IDS_AUTOFILL_DIALOG_ZIP_CODE));
 
@@ skipping 200 matching lines @@
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         1, views::GridLayout::FIXED, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         1, views::GridLayout::FIXED, 0, 0);
 }
 
 views::Label*
 AutoFillProfilesView::EditableSetViewContents::CreateLeftAlignedLabel(
     int label_id) {
-  views::Label* label = new views::Label(l10n_util::GetString(label_id));
+  views::Label* label =
+      new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(label_id)));
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   return label;
 }
 
 void AutoFillProfilesView::EditableSetViewContents::UpdateButtons() {
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 bool AutoFillProfilesView::EditableSetViewContents::UpdateContentsPhoneViews(
     TextFields field, views::Textfield* sender, const string16& new_contents) {
@@ skipping 88 matching lines @@
   } else {
     row -= profiles_->size();
     return WideToUTF16Hack(credit_cards_->at(row).credit_card.PreviewSummary());
   }
 }
 
 TableModel::Groups AutoFillProfilesView::ContentListTableModel::GetGroups() {
   TableModel::Groups groups;
 
   TableModel::Group profile_group;
-  profile_group.title = l10n_util::GetString(IDS_AUTOFILL_ADDRESSES_GROUP_NAME);
+  profile_group.title =
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_ADDRESSES_GROUP_NAME);
   profile_group.id = kAddressGroup;
   groups.push_back(profile_group);
 
   Group cc_group;
-  cc_group.title = l10n_util::GetString(IDS_AUTOFILL_CREDITCARDS_GROUP_NAME);
+  cc_group.title =
+      l10n_util::GetStringUTF16(IDS_AUTOFILL_CREDITCARDS_GROUP_NAME);
   cc_group.id = kCreditCardGroup;
   groups.push_back(cc_group);
 
   return groups;
 }
 
 int AutoFillProfilesView::ContentListTableModel::GetGroupID(int row) {
   DCHECK(row < static_cast<int>(profiles_->size() + credit_cards_->size()));
   return (row < static_cast<int>(profiles_->size())) ? kAddressGroup :
                                                        kCreditCardGroup;
@@ skipping 10 matching lines @@
                         AutoFillDialogObserver* observer,
                         Profile* profile) {
   DCHECK(profile);
 
   PersonalDataManager* personal_data_manager =
       profile->GetPersonalDataManager();
   DCHECK(personal_data_manager);
   AutoFillProfilesView::Show(parent, observer, personal_data_manager, profile,
                              profile->GetPrefs(), NULL, NULL);
 }