Remove wstrings from bookmarks, part 12.

chrome/browser/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"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
+#include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
@@ skipping 862 matching lines @@
       temporary_info_.credit_card.set_billing_address(
           base::IntToString16(
           observer_->profiles_set_[new_index].address.unique_id()));
     }
   } else if (combo_box == combo_box_month_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
       temporary_info_.credit_card.SetInfo(
           AutoFillType(CREDIT_CARD_EXP_MONTH),
-          combo_box_model_month_->GetItemAt(new_index));
+          UTF16ToWideHack(combo_box_model_month_->GetItemAt(new_index)));
     }
   } else if (combo_box == combo_box_year_) {
     if (new_index == -1) {
       NOTREACHED();
     } else {
       temporary_info_.credit_card.SetInfo(
           AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR),
-          combo_box_model_year_->GetItemAt(new_index));
+          UTF16ToWideHack(combo_box_model_year_->GetItemAt(new_index)));
     }
   } else {
     NOTREACHED();
   }
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::EditableSetViewContents, private:
 void AutoFillProfilesView::EditableSetViewContents::InitAddressFields(
     views::GridLayout* layout) {
@@ skipping 358 matching lines @@
   return -1;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // AutoFillProfilesView::AddressComboBoxModel,  ComboboxModel methods
 int AutoFillProfilesView::AddressComboBoxModel::GetItemCount() {
   int shift = is_billing_ ? 0 : 1;
   return static_cast<int>(address_labels_.size()) + shift;
 }
 
-std::wstring AutoFillProfilesView::AddressComboBoxModel::GetItemAt(int index) {
+string16 AutoFillProfilesView::AddressComboBoxModel::GetItemAt(int index) {
   int shift = is_billing_ ? 0 : 1;
   DCHECK(index < (static_cast<int>(address_labels_.size()) + shift));
   if (!is_billing_ && !index)
-    return l10n_util::GetString(IDS_AUTOFILL_DIALOG_SAME_AS_BILLING);
+    return l10n_util::GetStringUTF16(IDS_AUTOFILL_DIALOG_SAME_AS_BILLING);
   DCHECK(address_labels_.at(index - shift).is_address);
-  std::wstring label =
-      address_labels_.at(index - shift).address.Label();
+  string16 label =
+      WideToUTF16Hack(address_labels_.at(index - shift).address.Label());
   if (label.empty())
-    label = l10n_util::GetString(IDS_AUTOFILL_NEW_ADDRESS);
+    label = l10n_util::GetStringUTF16(IDS_AUTOFILL_NEW_ADDRESS);
   return label;
 }
 
 void AutoFillProfilesView::StringVectorComboboxModel::set_cb_strings(
     std::vector<std::wstring> *source) {
   cb_strings_.swap(*source);
 }
 
 int AutoFillProfilesView::StringVectorComboboxModel::GetItemCount() {
   return cb_strings_.size();
 }
 
-std::wstring AutoFillProfilesView::StringVectorComboboxModel::GetItemAt(
-    int index) {
+string16 AutoFillProfilesView::StringVectorComboboxModel::GetItemAt(int index) {
   DCHECK_GT(static_cast<int>(cb_strings_.size()), index);
-  return cb_strings_[index];
+  return WideToUTF16Hack(cb_strings_[index]);
 }
 
 int AutoFillProfilesView::StringVectorComboboxModel::GetIndex(
     const std::wstring& value) {
   for (size_t index = 0; index < cb_strings_.size(); ++index) {
     if (cb_strings_[index] == value)
       return index;
   }
   return -1;
 }
@@ skipping 78 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);
 }