diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-28 16:55:57 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-28 16:55:57 +0000 |
| commit | d223f3bfefc0c92a216f21c4d84e844bb663c2a6 (patch) | |
| tree | f4982b4490fe13de645b445ab95f3c82c95cf8aa /chrome/browser/character_encoding.h | |
| parent | bf570fb6773be4e4082b73c5b7a32fff5dc6663b (diff) | |
| download | chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.zip chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.tar.gz chromium_src-d223f3bfefc0c92a216f21c4d84e844bb663c2a6.tar.bz2 | |
Remove wstring from l10n_util. Part 1.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/5990008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/character_encoding.h')
| -rw-r--r-- | chrome/browser/character_encoding.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/character_encoding.h b/chrome/browser/character_encoding.h index ae1a6f1..7aa98a3 100644 --- a/chrome/browser/character_encoding.h +++ b/chrome/browser/character_encoding.h @@ -25,14 +25,14 @@ class CharacterEncoding { // l10n_util::SortVectorWithStringKey to sort the encoding menu items // by current locale character sequence. We need to keep the order within // encoding category name, that's why we use category name as key. - const std::wstring& GetStringKey() const { return encoding_category_name; } + const string16& GetStringKey() const { return encoding_category_name; } // Encoding command id. int encoding_id; // Encoding display name. - std::wstring encoding_display_name; + string16 encoding_display_name; // Encoding category name. - std::wstring encoding_category_name; + string16 encoding_category_name; }; // Return canonical encoding name according to the command ID. |