From a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Sun, 22 Aug 2010 16:49:37 +0000 Subject: Remove wstrings from bookmarks, part 12. - This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16 instead of a wstring. - This entailed changing the base class, ComboboxModel, and shaving a herd of yaks. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3159031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57021 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/language_combobox_model.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'chrome/browser/language_combobox_model.cc') diff --git a/chrome/browser/language_combobox_model.cc b/chrome/browser/language_combobox_model.cc index 1745167..e1b610b 100644 --- a/chrome/browser/language_combobox_model.cc +++ b/chrome/browser/language_combobox_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// 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. @@ -151,6 +151,14 @@ LanguageComboboxModel::LanguageComboboxModel( profile_(profile) { } +int LanguageComboboxModel::GetItemCount() { + return get_languages_count(); +} + +string16 LanguageComboboxModel::GetItemAt(int index) { + return WideToUTF16Hack(GetLanguageNameAt(index)); +} + // Returns the index of the language currently specified in the user's // preference file. Note that it's possible for language A to be picked // while chrome is currently in language B if the user specified language B -- cgit v1.1