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

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

Issue 10448066: Move the web dialogs code to src/ui/web_dialogs from src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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.h
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.h b/chrome/browser/ui/webui/certificate_viewer_webui.h
index e345a507f563abc52a0a66e3b317f801607fd46f..08e91a12baf191521e3fe2390ac6840413e67a5b 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.h
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.h
@@ -12,12 +12,14 @@
#include "base/compiler_specific.h"
#include "base/observer_list.h"
#include "base/values.h"
-#include "chrome/browser/ui/webui/web_dialog_delegate.h"
#include "content/public/browser/web_ui_message_handler.h"
#include "net/base/x509_certificate.h"
#include "ui/gfx/native_widget_types.h"
+#include "ui/web_dialogs/web_dialog_delegate.h"
+namespace ui {
class WebDialogObserver;
+}
// Displays the native or WebUI certificate viewer dialog for the given
// certificate.
@@ -28,7 +30,7 @@ void ShowCertificateViewer(gfx::NativeWindow parent,
// and chromeos builds to display detailed information in a floating dialog when
// the user clicks on "Certificate Information" from the lock icon of a web site
// or "View" from the Certificate Manager.
-class CertificateViewerDialog : private WebDialogDelegate {
+class CertificateViewerDialog : private ui::WebDialogDelegate {
public:
// Construct a certificate viewer for the passed in certificate. A reference
// to the certificate pointer is added for the lifetime of the certificate
@@ -40,13 +42,13 @@ class CertificateViewerDialog : private WebDialogDelegate {
void Show(gfx::NativeWindow parent);
// Add WebDialogObserver for this dialog.
- void AddObserver(WebDialogObserver* observer);
+ void AddObserver(ui::WebDialogObserver* observer);
// Remove WebDialogObserver for this dialog.
- void RemoveObserver(WebDialogObserver* observer);
+ void RemoveObserver(ui::WebDialogObserver* observer);
private:
- // Overridden from WebDialogDelegate:
+ // Overridden from ui::WebDialogDelegate:
virtual ui::ModalType GetDialogModalType() const OVERRIDE;
virtual string16 GetDialogTitle() const OVERRIDE;
virtual GURL GetDialogContentURL() const OVERRIDE;
@@ -71,7 +73,7 @@ class CertificateViewerDialog : private WebDialogDelegate {
// The title of the certificate viewer dialog, Certificate Viewer: CN.
string16 title_;
- ObserverList<WebDialogObserver> observers_;
+ ObserverList<ui::WebDialogObserver> observers_;
DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialog);
};
« no previous file with comments | « chrome/browser/ui/webui/certificate_viewer_ui.cc ('k') | chrome/browser/ui/webui/certificate_viewer_webui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698