diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 04:49:56 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 04:49:56 +0000 |
| commit | 1f659d97e4656f09c800f6432d50ac06d91b0aac (patch) | |
| tree | 81b0fb5b20c43edc74c3dfdd14af9cf4c6957723 /chrome/browser/download | |
| parent | 4743dadd60796ed4462c44ac4c8cc27673c8e6e6 (diff) | |
| download | chromium_src-1f659d97e4656f09c800f6432d50ac06d91b0aac.zip chromium_src-1f659d97e4656f09c800f6432d50ac06d91b0aac.tar.gz chromium_src-1f659d97e4656f09c800f6432d50ac06d91b0aac.tar.bz2 | |
Convert a bunch of uses of the wstring net::FormatUrl() to the new string16 one.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3287002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
| -rw-r--r-- | chrome/browser/download/download_item.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/download/download_item.cc b/chrome/browser/download/download_item.cc index 28fd0a8..fb6f854 100644 --- a/chrome/browser/download/download_item.cc +++ b/chrome/browser/download/download_item.cc @@ -327,9 +327,8 @@ bool DownloadItem::MatchesQuery(const string16& query) const { // L"/\x4f60\x597d\x4f60\x597d", // "/%E4%BD%A0%E5%A5%BD%E4%BD%A0%E5%A5%BD" PrefService* prefs = download_manager_->profile()->GetPrefs(); - std::wstring languages(UTF8ToWide(prefs->GetString(prefs::kAcceptLanguages))); - string16 url_formatted( - l10n_util::ToLower(WideToUTF16(net::FormatUrl(url_, languages)))); + std::string languages(prefs->GetString(prefs::kAcceptLanguages)); + string16 url_formatted(l10n_util::ToLower(net::FormatUrl(url_, languages))); if (url_formatted.find(query) != string16::npos) return true; |