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

Unified Diff: chrome/browser/ui/webui/options2/certificate_manager_handler2.cc

Issue 10667026: Start consolidating cross-port file selection code into ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix win Created 8 years, 6 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
Index: chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
index 5fb114ca7187709da3afeed0954149a5604b29a0..e480c446b1cc11718b6ca3a7ffc44676c06baea5 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler2.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/certificate_viewer.h"
#include "chrome/browser/ui/certificate_dialogs.h"
+#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/browser/ui/crypto_module_password_dialog.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/web_contents.h"
@@ -563,11 +564,12 @@ void CertificateManagerHandler::ExportPersonal(const ListValue* args) {
file_type_info.extension_description_overrides.push_back(
l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES));
file_type_info.include_all_files = true;
- select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_ = SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
select_file_dialog_->SelectFile(
SelectFileDialog::SELECT_SAVEAS_FILE, string16(),
FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
- web_ui()->GetWebContents(), GetParentWindow(),
+ GetParentWindow(),
reinterpret_cast<void*>(EXPORT_PERSONAL_FILE_SELECTED));
}
@@ -652,11 +654,12 @@ void CertificateManagerHandler::StartImportPersonal(const ListValue* args) {
file_type_info.extension_description_overrides.push_back(
l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES));
file_type_info.include_all_files = true;
- select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_ = SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
select_file_dialog_->SelectFile(
SelectFileDialog::SELECT_OPEN_FILE, string16(),
FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
- web_ui()->GetWebContents(), GetParentWindow(),
+ GetParentWindow(),
reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED));
}
@@ -769,12 +772,12 @@ void CertificateManagerHandler::ImportExportCleanup() {
}
void CertificateManagerHandler::ImportServer(const ListValue* args) {
- select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_ = SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
ShowCertSelectFileDialog(
select_file_dialog_.get(),
SelectFileDialog::SELECT_OPEN_FILE,
FilePath(),
- web_ui()->GetWebContents(),
GetParentWindow(),
reinterpret_cast<void*>(IMPORT_SERVER_FILE_SELECTED));
}
@@ -828,11 +831,11 @@ void CertificateManagerHandler::ImportServerFileRead(int read_errno,
}
void CertificateManagerHandler::ImportCA(const ListValue* args) {
- select_file_dialog_ = SelectFileDialog::Create(this);
+ select_file_dialog_ = SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
ShowCertSelectFileDialog(select_file_dialog_.get(),
SelectFileDialog::SELECT_OPEN_FILE,
FilePath(),
- web_ui()->GetWebContents(),
GetParentWindow(),
reinterpret_cast<void*>(IMPORT_CA_FILE_SELECTED));
}

Powered by Google App Engine
This is Rietveld 408576698