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

Unified Diff: chrome/browser/ui/webui/options2/certificate_manager_handler.h

Issue 10820034: Remove redirection header and add "ui::" before all SelectFileDialog usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reuploading for different try run. Created 8 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
Index: chrome/browser/ui/webui/options2/certificate_manager_handler.h
diff --git a/chrome/browser/ui/webui/options2/certificate_manager_handler.h b/chrome/browser/ui/webui/options2/certificate_manager_handler.h
index aeb8491926e912391954d22038d57c9ee558424a..8870afc3764177e74d9cef4d530a41a46c873478 100644
--- a/chrome/browser/ui/webui/options2/certificate_manager_handler.h
+++ b/chrome/browser/ui/webui/options2/certificate_manager_handler.h
@@ -12,9 +12,9 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/certificate_manager_model.h"
-#include "chrome/browser/ui/select_file_dialog.h"
#include "chrome/browser/ui/webui/options2/options_ui.h"
#include "net/base/cert_database.h"
+#include "ui/base/dialogs/select_file_dialog.h"
#include "ui/gfx/native_widget_types.h"
#if defined(OS_CHROMEOS)
@@ -26,9 +26,10 @@ namespace options2 {
class CertIdMap;
class FileAccessProvider;
-class CertificateManagerHandler : public OptionsPageUIHandler,
- public CertificateManagerModel::Observer,
- public SelectFileDialog::Listener {
+class CertificateManagerHandler
+ : public OptionsPageUIHandler,
+ public CertificateManagerModel::Observer,
+ public ui::SelectFileDialog::Listener {
public:
CertificateManagerHandler();
virtual ~CertificateManagerHandler();
@@ -168,7 +169,7 @@ class CertificateManagerHandler : public OptionsPageUIHandler,
bool use_hardware_backed_;
std::string file_data_;
net::CertificateList selected_cert_list_;
- scoped_refptr<SelectFileDialog> select_file_dialog_;
+ scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
scoped_refptr<net::CryptoModule> module_;
// Used in reading and writing certificate files.

Powered by Google App Engine
This is Rietveld 408576698