Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/webui/certificate_viewer_webui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/certificate_viewer_webui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/certificate_dialogs.h"
 #include "chrome/browser/ui/webui/certificate_viewer_ui.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/size.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
-using web_modal::NativeWebContentsModalDialog;
 
 // Shows a certificate using the WebUI certificate viewer.
 void ShowCertificateViewer(WebContents* web_contents,
                            gfx::NativeWindow parent,
                            net::X509Certificate* cert) {
   CertificateViewerDialog* dialog = new CertificateViewerDialog(cert);
   dialog->Show(web_contents, parent);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 12 matching lines @@
 CertificateViewerModalDialog::~CertificateViewerModalDialog() {
 }
 
 void CertificateViewerModalDialog::Show(content::WebContents* web_contents,
                                         gfx::NativeWindow parent) {
   window_ = chrome::ShowWebDialog(parent,
                                   web_contents->GetBrowserContext(),
                                   this);
 }
 
-NativeWebContentsModalDialog
+gfx::NativeWindow
 CertificateViewerModalDialog::GetNativeWebContentsModalDialog() {
 #if defined(USE_AURA)
   return window_;
 #else
   NOTREACHED();
   return NULL;
 #endif
 }
 
 ui::ModalType CertificateViewerModalDialog::GetDialogModalType() const {
@@ skipping 153 matching lines @@
 }
 
 void CertificateViewerDialog::Show(WebContents* web_contents,
                                    gfx::NativeWindow parent) {
   // TODO(bshe): UI tweaks needed for Aura HTML Dialog, such as adding padding
   // on the title for Aura ConstrainedWebDialogUI.
   dialog_ = ShowConstrainedWebDialog(web_contents->GetBrowserContext(), this,
                                      web_contents);
 }
 
-NativeWebContentsModalDialog
-CertificateViewerDialog::GetNativeWebContentsModalDialog() {
+gfx::NativeWindow CertificateViewerDialog::GetNativeWebContentsModalDialog() {
   return dialog_->GetNativeDialog();
 }
 
 GURL CertificateViewerDialog::GetDialogContentURL() const {
   return GURL(chrome::kChromeUICertificateViewerURL);
 }
 
 ui::ModalType CertificateViewerDialog::GetDialogModalType() const {
   return ui::MODAL_TYPE_NONE;
 }
@@ skipping 22 matching lines @@
       base::Bind(&CertificateViewerDialogHandler::RequestCertificateFields,
                  base::Unretained(this)));
 }
 
 void CertificateViewerDialogHandler::ExportCertificate(
     const base::ListValue* args) {
   int cert_index = GetCertificateIndex(args);
   if (cert_index < 0)
     return;
 
-  NativeWebContentsModalDialog window =
+  gfx::NativeWindow window =
       platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog());
   ShowCertExportDialog(web_ui()->GetWebContents(),
                        window,
                        cert_chain_.begin() + cert_index,
                        cert_chain_.end());
 }
 
 void CertificateViewerDialogHandler::RequestCertificateFields(
     const base::ListValue* args) {
   int cert_index = GetCertificateIndex(args);
@@ skipping 151 matching lines @@
     const base::ListValue* args) const {
   int cert_index;
   double val;
   if (!(args->GetDouble(0, &val)))
     return -1;
   cert_index = static_cast<int>(val);
   if (cert_index < 0 || cert_index >= static_cast<int>(cert_chain_.size()))
     return -1;
   return cert_index;
 }