Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / certificate_viewer_webui.h

diff --git a/src/chrome/browser/ui/webui/certificate_viewer_webui.h b/src/chrome/browser/ui/webui/certificate_viewer_webui.h
index 4873bae..0a0531a 100644 (file)
--- a/src/chrome/browser/ui/webui/certificate_viewer_webui.h
+++ b/src/chrome/browser/ui/webui/certificate_viewer_webui.h
@@ -32,7 +32,7 @@ class CertificateViewerModalDialog : public ui::WebDialogDelegate {
   // viewer.
   explicit CertificateViewerModalDialog(
       net::X509Certificate* cert);
-  virtual ~CertificateViewerModalDialog();
+  ~CertificateViewerModalDialog() override;
 
   virtual void Show(content::WebContents* web_contents,
                     gfx::NativeWindow parent);
@@ -42,20 +42,19 @@ class CertificateViewerModalDialog : public ui::WebDialogDelegate {
 
  protected:
   // Overridden from ui::WebDialogDelegate:
-  virtual ui::ModalType GetDialogModalType() const OVERRIDE;
-  virtual base::string16 GetDialogTitle() const OVERRIDE;
-  virtual GURL GetDialogContentURL() const OVERRIDE;
-  virtual void GetWebUIMessageHandlers(
-      std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
-  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
-  virtual std::string GetDialogArgs() const OVERRIDE;
-  virtual void OnDialogShown(
-      content::WebUI* webui,
-      content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
-  virtual void OnCloseContents(
-      content::WebContents* source, bool* out_close_dialog) OVERRIDE;
-  virtual bool ShouldShowDialogTitle() const OVERRIDE;
+  ui::ModalType GetDialogModalType() const override;
+  base::string16 GetDialogTitle() const override;
+  GURL GetDialogContentURL() const override;
+  void GetWebUIMessageHandlers(
+      std::vector<content::WebUIMessageHandler*>* handlers) const override;
+  void GetDialogSize(gfx::Size* size) const override;
+  std::string GetDialogArgs() const override;
+  void OnDialogShown(content::WebUI* webui,
+                     content::RenderViewHost* render_view_host) override;
+  void OnDialogClosed(const std::string& json_retval) override;
+  void OnCloseContents(content::WebContents* source,
+                       bool* out_close_dialog) override;
+  bool ShouldShowDialogTitle() const override;
 
   // The certificate being viewed.
   scoped_refptr<net::X509Certificate> cert_;
@@ -79,18 +78,18 @@ class CertificateViewerDialog : public CertificateViewerModalDialog {
   // to the certificate pointer is added for the lifetime of the certificate
   // viewer.
   explicit CertificateViewerDialog(net::X509Certificate* cert);
-  virtual ~CertificateViewerDialog();
+  ~CertificateViewerDialog() override;
 
   // CertificateViewerModalDialog overrides.
-  virtual void Show(content::WebContents* web_contents,
-                    gfx::NativeWindow parent) OVERRIDE;
-  virtual web_modal::NativeWebContentsModalDialog
-  GetNativeWebContentsModalDialog() OVERRIDE;
+  void Show(content::WebContents* web_contents,
+            gfx::NativeWindow parent) override;
+  web_modal::NativeWebContentsModalDialog GetNativeWebContentsModalDialog()
+      override;
 
  protected:
   // Overridden from ui::WebDialogDelegate:
-  virtual GURL GetDialogContentURL() const OVERRIDE;
-  virtual ui::ModalType GetDialogModalType() const OVERRIDE;
+  GURL GetDialogContentURL() const override;
+  ui::ModalType GetDialogModalType() const override;
 
  private:
   ConstrainedWebDialogDelegate* dialog_;
@@ -104,10 +103,10 @@ class CertificateViewerDialogHandler : public content::WebUIMessageHandler {
  public:
   CertificateViewerDialogHandler(CertificateViewerModalDialog* dialog,
                                  net::X509Certificate* cert);
-  virtual ~CertificateViewerDialogHandler();
+  ~CertificateViewerDialogHandler() override;
 
   // Overridden from WebUIMessageHandler
-  virtual void RegisterMessages() OVERRIDE;
+  void RegisterMessages() override;
 
  private:
   // Brings up the export certificate dialog for the chosen certificate in the