summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/options/content_page_view.cc
diff options
context:
space:
mode:
authorjoshia@google.com <joshia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 18:26:09 +0000
committerjoshia@google.com <joshia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-19 18:26:09 +0000
commitbc570fa3f78d9020a61a7d9556e5d17292b80da0 (patch)
tree008268f1e64d6b4c0dfd6167829b6d7e770420ff /chrome/browser/views/options/content_page_view.cc
parent9a0ec6e1dc240f88f2f2c4dd811943893ea071ba (diff)
downloadchromium_src-bc570fa3f78d9020a61a7d9556e5d17292b80da0.zip
chromium_src-bc570fa3f78d9020a61a7d9556e5d17292b80da0.tar.gz
chromium_src-bc570fa3f78d9020a61a7d9556e5d17292b80da0.tar.bz2
Submitting for developer0420@gmail.com
The LPITEMIDLIST returned from SHBrowseForFolder might not get released if SHGetPathFromIDList fails Added in the comment changes Added GetDisplayNameOf for getting selection, using old way if STRRET Structure type does not equal STRRET_WSTR as I was unable to get complete code coverage. Added BrowseCallbackProc and listen to MSG so that we can highlight existing value Added in the comment changes ( changed to smart pointer for managing COM interface pointers.) Review URL: http://codereview.chromium.org/11481 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options/content_page_view.cc')
-rw-r--r--chrome/browser/views/options/content_page_view.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 665b14b..acad68d 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -196,9 +196,12 @@ void ContentPageView::ButtonPressed(views::NativeButton* sender) {
const std::wstring dialog_title =
l10n_util::GetString(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE);
select_file_dialog_->SelectFile(SelectFileDialog::SELECT_FOLDER,
- dialog_title, std::wstring(),
+ dialog_title,
+ profile()->GetPrefs()->GetString(
+ prefs::kDownloadDefaultDirectory),
std::wstring(), std::wstring(),
- GetRootWindow(), NULL);
+ GetRootWindow(),
+ NULL);
} else if (sender == download_ask_for_save_location_checkbox_) {
bool enabled = download_ask_for_save_location_checkbox_->IsSelected();
if (enabled) {