diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 16:49:37 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 16:49:37 +0000 |
| commit | a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2 (patch) | |
| tree | e05c5e6959584c84cef55647d9bf1e4bbb2217d9 /chrome/browser/content_setting_combo_model.h | |
| parent | e7afe2458ed03e907601cd3c05dc5f253f824d88 (diff) | |
| download | chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.zip chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.tar.gz chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/content_setting_combo_model.h')
| -rw-r--r-- | chrome/browser/content_setting_combo_model.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/content_setting_combo_model.h b/chrome/browser/content_setting_combo_model.h index bb00acd..dac487f 100644 --- a/chrome/browser/content_setting_combo_model.h +++ b/chrome/browser/content_setting_combo_model.h @@ -9,6 +9,7 @@ #include "app/combobox_model.h" #include "base/basictypes.h" +#include "base/string16.h" #include "chrome/common/content_settings.h" class ContentSettingComboModel : public ComboboxModel { @@ -17,8 +18,7 @@ class ContentSettingComboModel : public ComboboxModel { virtual ~ContentSettingComboModel(); virtual int GetItemCount(); - - virtual std::wstring GetItemAt(int index); + virtual string16 GetItemAt(int index); ContentSetting SettingForIndex(int index); |