Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc

Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc ('k') | ui/shell_dialogs/select_file_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
diff --git a/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc b/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
index 8d6c8f6fd1de26680d7b0e2bef30841ad32e05ce..e41c327bc3249e1c1c4067c45e2df2ac48e6bc21 100644
--- a/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
+++ b/ui/shell_dialogs/gtk/select_file_dialog_impl_kde.cc
@@ -120,7 +120,8 @@ class SelectFileDialogImplKDE : public ui::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);
@@ -194,7 +195,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:
@@ -331,15 +333,18 @@ 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;
base::WorkerPool::PostTask(FROM_HERE,
base::Bind(
&SelectFileDialogImplKDE::CallKDialogOutput,
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)),
@@ -478,4 +483,3 @@ SelectFileDialogImpl* SelectFileDialogImpl::NewSelectFileDialogImplKDE(
}
} // namespace ui
-
« no previous file with comments | « ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc ('k') | ui/shell_dialogs/select_file_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698