diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:14:53 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:14:53 +0000 |
commit | 47e870bf26f0c01dafe611ec03c0139c735063df (patch) | |
tree | 43b29b36654d896cf3fd1bd3cc27b830c63522b0 /chrome/browser/download/download_prefs.cc | |
parent | 883844f40f19b80880e0730a8e2836e6383d1400 (diff) | |
download | chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.zip chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.gz chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.bz2 |
Revert 184352
> Add utf_string_conversions to base namespace.
>
> This adds "using"s for all functions so those can be fixed in a separate pass.
>
> This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/12314090
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/12315071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_prefs.cc')
-rw-r--r-- | chrome/browser/download/download_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index 3d48741..abd8dff 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -69,7 +69,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) { #if defined(OS_POSIX) base::FilePath path(extensions[i]); #elif defined(OS_WIN) - base::FilePath path(base::UTF8ToWide(extensions[i])); + base::FilePath path(UTF8ToWide(extensions[i])); #endif if (!extensions[i].empty() && download_util::GetFileDangerLevel(path) == download_util::NotDangerous) @@ -196,7 +196,7 @@ void DownloadPrefs::SaveAutoOpenState() { std::string this_extension = *it; #elif defined(OS_WIN) // TODO(phajdan.jr): Why we're using Sys conversion here, but not in ctor? - std::string this_extension = base::Sysbase::WideToUTF8(*it); + std::string this_extension = base::SysWideToUTF8(*it); #endif extensions += this_extension + ":"; } |