Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/webui/certificate_viewer_webui.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_WEBUI_H_
 #define CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_WEBUI_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/values.h"
-#include "components/web_modal/native_web_contents_modal_dialog.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
 namespace content {
 class WebContents;
 }
 
 class ConstrainedWebDialogDelegate;
 
 // Modal dialog for displaying detailed certificate information. This is used in
 // chromeos builds to display detailed information in a modal dialog when the
 // user clicks on "View" from the Certificate Manager dialog.
 class CertificateViewerModalDialog : public 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
   // viewer.
   explicit CertificateViewerModalDialog(
       net::X509Certificate* cert);
   ~CertificateViewerModalDialog() override;
 
   virtual void Show(content::WebContents* web_contents,
                     gfx::NativeWindow parent);
-  virtual web_modal::NativeWebContentsModalDialog
-  GetNativeWebContentsModalDialog();
+  virtual gfx::NativeWindow GetNativeWebContentsModalDialog();
   const content::WebUI* GetWebUI() const { return webui_; }
 
  protected:
   // Overridden from ui::WebDialogDelegate:
   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;
@@ skipping 25 matching lines @@
  public:
   // Construct a certificate viewer for the passed in certificate. A reference
   // to the certificate pointer is added for the lifetime of the certificate
   // viewer.
   explicit CertificateViewerDialog(net::X509Certificate* cert);
   ~CertificateViewerDialog() override;
 
   // CertificateViewerModalDialog overrides.
   void Show(content::WebContents* web_contents,
             gfx::NativeWindow parent) override;
-  web_modal::NativeWebContentsModalDialog GetNativeWebContentsModalDialog()
-      override;
+  gfx::NativeWindow GetNativeWebContentsModalDialog() override;
 
  protected:
   // Overridden from ui::WebDialogDelegate:
   GURL GetDialogContentURL() const override;
   ui::ModalType GetDialogModalType() const override;
 
  private:
   ConstrainedWebDialogDelegate* dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialog);
@@ skipping 35 matching lines @@
   CertificateViewerModalDialog* dialog_;
 
   // The certificate chain. Does not take references, so only valid as long as
   // |cert_| is.
   net::X509Certificate::OSCertHandles cert_chain_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialogHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_WEBUI_H_