diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 22:03:25 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 22:03:25 +0000 |
| commit | 9496f354a949f3b34e23acedfce3c50413ee0cf1 (patch) | |
| tree | 3550eef3692cc78862582d07afa14dc79b89a4b1 | |
| parent | abfa74e4046808d3075cea4d260c92c05a48e6b7 (diff) | |
| download | chromium_src-9496f354a949f3b34e23acedfce3c50413ee0cf1.zip chromium_src-9496f354a949f3b34e23acedfce3c50413ee0cf1.tar.gz chromium_src-9496f354a949f3b34e23acedfce3c50413ee0cf1.tar.bz2 | |
prefs::kDownloadDefaultDirectory should always be initialized in DownloadManager::RegisterUserPrefs, remove code that assumes otherwise.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/209003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26496 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/download/save_package.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index e268c34..eba8760 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -8,7 +8,6 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/path_service.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/task.h" @@ -1023,18 +1022,11 @@ FilePath SavePackage::GetSaveDirPreference(PrefService* prefs) { if (!prefs->IsPrefRegistered(prefs::kSaveFileDefaultDirectory)) { FilePath default_save_path; - if (!prefs->IsPrefRegistered(prefs::kDownloadDefaultDirectory)) { - if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, - &default_save_path)) { - NOTREACHED(); - } - } else { - StringPrefMember default_download_path; - default_download_path.Init(prefs::kDownloadDefaultDirectory, - prefs, NULL); - default_save_path = - FilePath::FromWStringHack(default_download_path.GetValue()); - } + StringPrefMember default_download_path; + DCHECK(prefs->IsPrefRegistered(prefs::kDownloadDefaultDirectory)); + default_download_path.Init(prefs::kDownloadDefaultDirectory, prefs, NULL); + default_save_path = + FilePath::FromWStringHack(default_download_path.GetValue()); prefs->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_save_path); } |