diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 04:43:36 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 04:43:36 +0000 |
| commit | 38233e6c082d748aac5f55cc38ca0d2e581755a6 (patch) | |
| tree | a2172efa91d6d0d8a4de69a40dc4f445bd01d2ed /chrome/browser/download/save_package.cc | |
| parent | 20ae4824364a0a871bae34322b030424f0f78653 (diff) | |
| download | chromium_src-38233e6c082d748aac5f55cc38ca0d2e581755a6.zip chromium_src-38233e6c082d748aac5f55cc38ca0d2e581755a6.tar.gz chromium_src-38233e6c082d748aac5f55cc38ca0d2e581755a6.tar.bz2 | |
Get rid of more calls to FromWStringHack.
BUG=24672
TEST=compiles
Patch from Thiago Farina <thiago.farina@gmail.com>
Review URL: http://codereview.chromium.org/1750013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/save_package.cc')
| -rw-r--r-- | chrome/browser/download/save_package.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index a549e9c..d58cc48 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -1133,22 +1133,19 @@ FilePath SavePackage::GetSaveDirPreference(PrefService* prefs) { DCHECK(prefs); if (!prefs->FindPreference(prefs::kSaveFileDefaultDirectory)) { - FilePath default_save_path; - StringPrefMember default_download_path; DCHECK(prefs->FindPreference(prefs::kDownloadDefaultDirectory)); - default_download_path.Init(prefs::kDownloadDefaultDirectory, prefs, NULL); - default_save_path = - FilePath::FromWStringHack(default_download_path.GetValue()); + FilePath default_save_path = prefs->GetFilePath( + prefs::kDownloadDefaultDirectory); prefs->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_save_path); } // Get the directory from preference. - StringPrefMember save_file_path; - save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL); - DCHECK(!(*save_file_path).empty()); + FilePath save_file_path = prefs->GetFilePath( + prefs::kSaveFileDefaultDirectory); + DCHECK(!save_file_path.empty()); - return FilePath::FromWStringHack(*save_file_path); + return save_file_path; } void SavePackage::GetSaveInfo() { |