| Index: chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
|
| diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
|
| index 717e9d7679ab567c031705f883fcfda7af933177..d651144947a95eef174ef03a80db8c5468369d71 100644
|
| --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
|
| +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
|
| @@ -113,7 +113,8 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
|
| // us when we were told to show the dialog.
|
| void FileNotSelected(void *params);
|
|
|
| - void CreateSelectFolderDialog(const std::string& title,
|
| + void CreateSelectFolderDialog(Type type,
|
| + const std::string& title,
|
| const base::FilePath& default_path,
|
| gfx::NativeWindow parent, void* params);
|
|
|
| @@ -209,7 +210,8 @@ void SelectFileDialogImplKDE::SelectFileImpl(
|
|
|
| switch (type) {
|
| case SELECT_FOLDER:
|
| - CreateSelectFolderDialog(title_string, default_path,
|
| + case SELECT_UPLOAD_FOLDER:
|
| + CreateSelectFolderDialog(type, title_string, default_path,
|
| owning_window, params);
|
| return;
|
| case SELECT_OPEN_FILE:
|
| @@ -351,8 +353,11 @@ void SelectFileDialogImplKDE::FileNotSelected(void* params) {
|
| }
|
|
|
| void SelectFileDialogImplKDE::CreateSelectFolderDialog(
|
| - const std::string& title, const base::FilePath& default_path,
|
| + Type type, const std::string& title, const base::FilePath& default_path,
|
| gfx::NativeWindow parent, void *params) {
|
| + int title_message_id = (type == SELECT_UPLOAD_FOLDER)
|
| + ? IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE
|
| + : IDS_SELECT_FOLDER_DIALOG_TITLE;
|
| BrowserThread::PostTask(
|
| BrowserThread::FILE, FROM_HERE,
|
| base::Bind(
|
| @@ -360,7 +365,7 @@ void SelectFileDialogImplKDE::CreateSelectFolderDialog(
|
| this,
|
| KDialogParams(
|
| "--getexistingdirectory",
|
| - GetTitle(title, IDS_SELECT_FOLDER_DIALOG_TITLE),
|
| + GetTitle(title, title_message_id),
|
| default_path.empty() ? *last_opened_path_ : default_path,
|
| parent, false, false, params,
|
| &SelectFileDialogImplKDE::OnSelectSingleFolderDialogResponse)));
|
|
|