Remove NativeWebContentsModalDialog and NativePopup typedefs.

components/web_modal/web_contents_modal_dialog_manager.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 "components/web_modal/web_contents_modal_dialog_manager.h"
 
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 14 matching lines @@
     WebContentsModalDialogManagerDelegate* d) {
   delegate_ = d;
 
   for (WebContentsModalDialogList::iterator it = child_dialogs_.begin();
        it != child_dialogs_.end(); it++) {
     // Delegate can be NULL on Views/Win32 during tab drag.
     (*it)->manager->HostChanged(d ? d->GetWebContentsModalDialogHost() : NULL);
   }
 }
 
-void WebContentsModalDialogManager::ShowModalDialog(
-    NativeWebContentsModalDialog dialog) {
+void WebContentsModalDialogManager::ShowModalDialog(gfx::NativeWindow dialog) {
   scoped_ptr<SingleWebContentsDialogManager> mgr(
       CreateNativeWebModalManager(dialog, this));
   ShowDialogWithManager(dialog, mgr.Pass());
 }
 
 // TODO(gbillock): Maybe "ShowBubbleWithManager"?
 void WebContentsModalDialogManager::ShowDialogWithManager(
-    NativeWebContentsModalDialog dialog,
+    gfx::NativeWindow dialog,
     scoped_ptr<SingleWebContentsDialogManager> manager) {
   if (delegate_)
     manager->HostChanged(delegate_->GetWebContentsModalDialogHost());
   child_dialogs_.push_back(new DialogState(dialog, manager.Pass()));
 
   if (child_dialogs_.size() == 1) {
     BlockWebContentsInteraction(true);
     if (delegate_ && delegate_->IsWebContentsVisible(web_contents()))
       child_dialogs_.back()->manager->Show();
   }
 }
 
 bool WebContentsModalDialogManager::IsDialogActive() const {
   return !child_dialogs_.empty();
 }
 
 void WebContentsModalDialogManager::FocusTopmostDialog() const {
   DCHECK(!child_dialogs_.empty());
   child_dialogs_.front()->manager->Focus();
 }
 
 content::WebContents* WebContentsModalDialogManager::GetWebContents() const {
   return web_contents();
 }
 
-void WebContentsModalDialogManager::WillClose(
-    NativeWebContentsModalDialog dialog) {
+void WebContentsModalDialogManager::WillClose(gfx::NativeWindow dialog) {
   WebContentsModalDialogList::iterator dlg = FindDialogState(dialog);
 
   // The Views tab contents modal dialog calls WillClose twice.  Ignore the
   // second invocation.
   if (dlg == child_dialogs_.end())
     return;
 
   bool removed_topmost_dialog = dlg == child_dialogs_.begin();
   scoped_ptr<DialogState> deleter(*dlg);
   child_dialogs_.erase(dlg);
   if (!child_dialogs_.empty() && removed_topmost_dialog &&
       !closing_all_dialogs_) {
     child_dialogs_.front()->manager->Show();
   }
 
   BlockWebContentsInteraction(!child_dialogs_.empty());
 }
 
 WebContentsModalDialogManager::WebContentsModalDialogManager(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       delegate_(NULL),
       closing_all_dialogs_(false) {
 }
 
 WebContentsModalDialogManager::DialogState::DialogState(
-    NativeWebContentsModalDialog dialog,
+    gfx::NativeWindow dialog,
     scoped_ptr<SingleWebContentsDialogManager> mgr)
     : dialog(dialog),
       manager(mgr.release()) {
 }
 
 WebContentsModalDialogManager::DialogState::~DialogState() {}
 
 WebContentsModalDialogManager::WebContentsModalDialogList::iterator
-    WebContentsModalDialogManager::FindDialogState(
-        NativeWebContentsModalDialog dialog) {
+WebContentsModalDialogManager::FindDialogState(gfx::NativeWindow dialog) {
   WebContentsModalDialogList::iterator i;
   for (i = child_dialogs_.begin(); i != child_dialogs_.end(); ++i) {
     if ((*i)->dialog == dialog)
       break;
   }
 
   return i;
 }
 
 // TODO(gbillock): Move this to Views impl within Show()? It would
@@ skipping 61 matching lines @@
 }
 
 void WebContentsModalDialogManager::DidAttachInterstitialPage() {
   // TODO(wittman): Test closing on interstitial webui works properly on Mac.
 #if defined(USE_AURA)
   CloseAllDialogs();
 #endif
 }
 
 }  // namespace web_modal