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

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

Issue 9003014: Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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
===================================================================
--- chrome/browser/ui/webui/options2/certificate_manager_handler2.cc (revision 116011)
+++ chrome/browser/ui/webui/options2/certificate_manager_handler2.cc (working copy)
@@ -15,9 +15,9 @@
#include "chrome/browser/certificate_viewer.h"
#include "chrome/browser/ui/certificate_dialogs.h"
#include "chrome/browser/ui/crypto_module_password_dialog.h"
-#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_view.h"
-#include "content/public/browser/browser_thread.h" // for FileAccessProvider
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/web_contents.h"
#include "grit/generated_resources.h"
#include "net/base/crypto_module.h"
#include "net/base/x509_certificate.h"
@@ -568,7 +568,7 @@
select_file_dialog_->SelectFile(
SelectFileDialog::SELECT_SAVEAS_FILE, string16(),
FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
- web_ui()->tab_contents(), GetParentWindow(),
+ web_ui()->web_contents(), GetParentWindow(),
reinterpret_cast<void*>(EXPORT_PERSONAL_FILE_SELECTED));
}
@@ -657,7 +657,7 @@
select_file_dialog_->SelectFile(
SelectFileDialog::SELECT_OPEN_FILE, string16(),
FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
- web_ui()->tab_contents(), GetParentWindow(),
+ web_ui()->web_contents(), GetParentWindow(),
reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED));
}
@@ -775,7 +775,7 @@
select_file_dialog_.get(),
SelectFileDialog::SELECT_OPEN_FILE,
FilePath(),
- web_ui()->tab_contents(),
+ web_ui()->web_contents(),
GetParentWindow(),
reinterpret_cast<void*>(IMPORT_SERVER_FILE_SELECTED));
}
@@ -831,7 +831,7 @@
ShowCertSelectFileDialog(select_file_dialog_.get(),
SelectFileDialog::SELECT_OPEN_FILE,
FilePath(),
- web_ui()->tab_contents(),
+ web_ui()->web_contents(),
GetParentWindow(),
reinterpret_cast<void*>(IMPORT_CA_FILE_SELECTED));
}
@@ -915,7 +915,7 @@
net::X509Certificate* cert = CallbackArgsToCert(args);
if (!cert)
return;
- ShowCertExportDialog(web_ui()->tab_contents(), GetParentWindow(),
+ ShowCertExportDialog(web_ui()->web_contents(), GetParentWindow(),
cert->os_cert_handle());
}
@@ -1048,7 +1048,7 @@
#endif
gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
- return web_ui()->tab_contents()->GetView()->GetTopLevelNativeWindow();
+ return web_ui()->web_contents()->GetView()->GetTopLevelNativeWindow();
}
} // namespace options2

Powered by Google App Engine
This is Rietveld 408576698