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

Unified Diff: chrome/browser/ui/webui/certificate_viewer_webui.cc

Issue 10332231: Remove chrome::NOTIFICATION_WEB_DIALOG_SHOWN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add web_dialog_observer.h to chrome_browser.gypi Created 8 years, 7 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/certificate_viewer_webui.cc
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc
index 47780400825ebe7d60089eecb08998a7c2ae73cf..65583303167252347a6ca2a478158156391f27fb 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/ui/constrained_window.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
+#include "chrome/browser/ui/webui/web_dialog_observer.h"
#include "chrome/common/net/x509_certificate_model.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/web_contents.h"
@@ -38,16 +39,19 @@ const int kDefaultHeight = 600;
// Shows a certificate using the WebUI certificate viewer.
void ShowCertificateViewer(gfx::NativeWindow parent,
net::X509Certificate* cert) {
- CertificateViewerDialog::ShowDialog(parent, cert);
+ CertificateViewerDialog* dialog = new CertificateViewerDialog(cert);
+ dialog->Show(parent);
}
////////////////////////////////////////////////////////////////////////////////
// CertificateViewerDialog
-void CertificateViewerDialog::ShowDialog(gfx::NativeWindow parent,
- net::X509Certificate* cert) {
- CertificateViewerDialog* dialog = new CertificateViewerDialog(cert);
- dialog->Show(parent);
+void CertificateViewerDialog::AddObserver(WebDialogObserver* observer) {
+ observers_.AddObserver(observer);
+}
+
+void CertificateViewerDialog::RemoveObserver(WebDialogObserver* observer) {
+ observers_.RemoveObserver(observer);
}
CertificateViewerDialog::CertificateViewerDialog(net::X509Certificate* cert)
@@ -199,6 +203,14 @@ std::string CertificateViewerDialog::GetDialogArgs() const {
return data;
}
+void CertificateViewerDialog::OnDialogShown(
+ content::WebUI* webui,
+ content::RenderViewHost* render_view_host) {
+ FOR_EACH_OBSERVER(WebDialogObserver,
+ observers_,
+ OnDialogShown(webui, render_view_host));
+}
+
void CertificateViewerDialog::OnDialogClosed(const std::string& json_retval) {
delete this;
}
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_webui.h ('k') | chrome/browser/ui/webui/constrained_web_dialog_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698