| Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| index 02ff4775eaa8550dc09316b17a855123550612ed..9c7d4313a753a939d3b70e8b8af383899390a751 100644
|
| --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
|
| @@ -709,6 +709,10 @@ void CertificateManagerHandler::StartImportPersonal(
|
| ImportExportCleanup();
|
| return;
|
| }
|
| + base::FilePath default_path;
|
| + base::string16 path_string;
|
| + if (args->GetString(1, &path_string))
|
| + default_path = base::FilePath::FromUTF16Unsafe(path_string);
|
| file_type_info.extensions.resize(1);
|
| file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12"));
|
| file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("crt"));
|
| @@ -719,7 +723,7 @@ void CertificateManagerHandler::StartImportPersonal(
|
| this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
|
| select_file_dialog_->SelectFile(
|
| ui::SelectFileDialog::SELECT_OPEN_FILE, base::string16(),
|
| - base::FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
|
| + default_path, &file_type_info, 1, FILE_PATH_LITERAL("p12"),
|
| GetParentWindow(),
|
| reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED));
|
| }
|
|
|