Remove NativeWebContentsModalDialog and NativePopup typedefs.

components/web_modal/popup_manager.cc

 // Copyright 2014 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/popup_manager.h"
 
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ skipping 27 matching lines @@
       weak_factory_(this) {}
 
 PopupManager::~PopupManager() {
 }
 
 void PopupManager::ShowPopup(scoped_ptr<SinglePopupManager> manager) {
   content::WebContents* web_contents = manager->GetBoundWebContents();
   // TODO(gbillock): get rid of this when we handle bubbles
   DCHECK(web_contents);
 
-  // TODO(gbillock): remove when we port the popup management logic to this
-  // class.
-  NativeWebContentsModalDialog dialog =
-      static_cast<NativeWebContentsModalDialog>(manager->popup());
-
   WebContentsModalDialogManager* wm_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   DCHECK(wm_manager);
-  wm_manager->ShowModalDialog(dialog);
+  wm_manager->ShowModalDialog(manager->popup());
 }
 
-void PopupManager::ShowModalDialog(NativePopup popup,
+void PopupManager::ShowModalDialog(gfx::NativeWindow popup,
                                    content::WebContents* web_contents) {
   // TODO make a new native popup manager and call ShowPopup.
   // For now just lay off to WCMDM.
   WebContentsModalDialogManager* manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   manager->ShowModalDialog(popup);
 }
 
 bool PopupManager::IsWebModalDialogActive(
     const content::WebContents* web_contents) const {
   if (web_contents == NULL)
     return false;
 
   const WebContentsModalDialogManager* manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   return manager && manager->IsDialogActive();
 }
 
 void PopupManager::WasFocused(const content::WebContents* web_contents) {
   if (!IsWebModalDialogActive(web_contents))
     return;
 
   const WebContentsModalDialogManager* manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   if (manager)
     manager->FocusTopmostDialog();
 }
 
-void PopupManager::WillClose(NativePopup popup) {
+void PopupManager::WillClose(gfx::NativeWindow popup) {
 }
 
 void PopupManager::RegisterWith(content::WebContents* web_contents) {
   web_contents->SetUserData(kPopupManagerUserDataKey,
                             new PopupManagerRelay(weak_factory_.GetWeakPtr()));
   // TODO(gbillock): Need to do something more extreme here to manage changing
   // popup managers with popups in-flight?
 }
 
 void PopupManager::UnregisterWith(content::WebContents* web_contents) {
@@ skipping 21 matching lines @@
 void PopupManager::CloseAllDialogsForTesting(
     content::WebContents* web_contents) {
   // TODO: re-implement, probably in terms of something in the host_,
   // or of owned WCMDMs.
   WebContentsModalDialogManager* manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   manager->CloseAllDialogs();
 }
 
 }  // namespace web_modal