| 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 6a83451a8d144b37ab8db2a1db998e78ff6905bd..d707185d509bcdfb90a7471344b3116a9a058aec 100644
|
| --- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
|
| +++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
|
| @@ -100,9 +100,13 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
|
| std::string GetMimeTypeFilterString();
|
|
|
| // Get KDialog command line representing the Argv array for KDialog.
|
| - void GetKDialogCommandLine(const std::string& type, const std::string& title,
|
| - const base::FilePath& default_path, XID parent,
|
| - bool file_operation, bool multiple_selection, CommandLine* command_line);
|
| + void GetKDialogCommandLine(const std::string& type,
|
| + const std::string& title,
|
| + const base::FilePath& default_path,
|
| + XID parent,
|
| + bool file_operation,
|
| + bool multiple_selection,
|
| + base::CommandLine* command_line);
|
|
|
| // Call KDialog on the FILE thread and post results back to the UI thread.
|
| void CallKDialogOutput(const KDialogParams& params);
|
| @@ -167,10 +171,10 @@ bool SelectFileDialogImpl::CheckKDEDialogWorksOnUIThread() {
|
| // only do this once, the first time a file dialog is displayed.
|
| base::ThreadRestrictions::ScopedAllowIO allow_io;
|
|
|
| - CommandLine::StringVector cmd_vector;
|
| + base::CommandLine::StringVector cmd_vector;
|
| cmd_vector.push_back(kKdialogBinary);
|
| cmd_vector.push_back("--version");
|
| - CommandLine command_line(cmd_vector);
|
| + base::CommandLine command_line(cmd_vector);
|
| std::string dummy;
|
| return base::GetAppOutput(command_line, &dummy);
|
| }
|
| @@ -290,9 +294,9 @@ std::string SelectFileDialogImplKDE::GetMimeTypeFilterString() {
|
|
|
| void SelectFileDialogImplKDE::CallKDialogOutput(const KDialogParams& params) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::FILE);
|
| - CommandLine::StringVector cmd_vector;
|
| + base::CommandLine::StringVector cmd_vector;
|
| cmd_vector.push_back(kKdialogBinary);
|
| - CommandLine command_line(cmd_vector);
|
| + base::CommandLine command_line(cmd_vector);
|
| GetKDialogCommandLine(params.type, params.title, params.default_path,
|
| params.parent, params.file_operation,
|
| params.multiple_selection, &command_line);
|
| @@ -311,10 +315,14 @@ void SelectFileDialogImplKDE::CallKDialogOutput(const KDialogParams& params) {
|
| params.kdialog_params));
|
| }
|
|
|
| -void SelectFileDialogImplKDE::GetKDialogCommandLine(const std::string& type,
|
| - const std::string& title, const base::FilePath& path,
|
| - XID parent, bool file_operation, bool multiple_selection,
|
| - CommandLine* command_line) {
|
| +void SelectFileDialogImplKDE::GetKDialogCommandLine(
|
| + const std::string& type,
|
| + const std::string& title,
|
| + const base::FilePath& path,
|
| + XID parent,
|
| + bool file_operation,
|
| + bool multiple_selection,
|
| + base::CommandLine* command_line) {
|
| CHECK(command_line);
|
|
|
| // Attach to the current Chrome window.
|
|
|