Index: chrome/browser/ui/certificate_dialogs.cc |
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc |
index 264086c3c2dcd3382250f359b3963ecd674046cc..b3dacb0b4634e45dcce63af33cd11279e7e70f9b 100644 |
--- a/chrome/browser/ui/certificate_dialogs.cc |
+++ b/chrome/browser/ui/certificate_dialogs.cc |
@@ -16,6 +16,7 @@ |
#include "chrome/common/net/x509_certificate_model.h" |
#include "content/public/browser/browser_thread.h" |
#include "grit/generated_resources.h" |
+#include "ui/base/dialogs/select_file_dialog.h" |
#include "ui/base/l10n/l10n_util.h" |
using content::BrowserThread; |
@@ -60,7 +61,7 @@ std::string GetBase64String(net::X509Certificate::OSCertHandle cert) { |
//////////////////////////////////////////////////////////////////////////////// |
// General utility functions. |
-class Exporter : public SelectFileDialog::Listener { |
+class Exporter : public ui::SelectFileDialog::Listener { |
public: |
Exporter(WebContents* web_contents, gfx::NativeWindow parent, |
net::X509Certificate::OSCertHandle cert); |
@@ -71,7 +72,7 @@ class Exporter : public SelectFileDialog::Listener { |
int index, void* params); |
virtual void FileSelectionCanceled(void* params); |
private: |
- scoped_refptr<SelectFileDialog> select_file_dialog_; |
+ scoped_refptr<ui::SelectFileDialog> select_file_dialog_; |
// The certificate hierarchy (leaf cert first). |
net::X509Certificate::OSCertHandles cert_chain_list_; |
@@ -80,7 +81,7 @@ class Exporter : public SelectFileDialog::Listener { |
Exporter::Exporter(WebContents* web_contents, |
gfx::NativeWindow parent, |
net::X509Certificate::OSCertHandle cert) |
- : select_file_dialog_(SelectFileDialog::Create( |
+ : select_file_dialog_(ui::SelectFileDialog::Create( |
this, new ChromeSelectFilePolicy(web_contents))) { |
x509_certificate_model::GetCertChainFromCert(cert, &cert_chain_list_); |
@@ -92,7 +93,7 @@ Exporter::Exporter(WebContents* web_contents, |
suggested_path = FilePath(cert_title); |
ShowCertSelectFileDialog(select_file_dialog_.get(), |
- SelectFileDialog::SELECT_SAVEAS_FILE, |
+ ui::SelectFileDialog::SELECT_SAVEAS_FILE, |
suggested_path, |
parent, |
NULL); |
@@ -142,12 +143,12 @@ void Exporter::FileSelectionCanceled(void* params) { |
} // namespace |
-void ShowCertSelectFileDialog(SelectFileDialog* select_file_dialog, |
- SelectFileDialog::Type type, |
+void ShowCertSelectFileDialog(ui::SelectFileDialog* select_file_dialog, |
+ ui::SelectFileDialog::Type type, |
const FilePath& suggested_path, |
gfx::NativeWindow parent, |
void* params) { |
- SelectFileDialog::FileTypeInfo file_type_info; |
+ ui::SelectFileDialog::FileTypeInfo file_type_info; |
file_type_info.extensions.resize(5); |
file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("pem")); |
file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("crt")); |