Remove NativeWebContentsModalDialog and NativePopup typedefs.

components/web_modal/web_contents_modal_dialog_manager.h

 // Copyright 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 COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
 #define COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
 
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
     : public SingleWebContentsDialogManagerDelegate,
       public content::WebContentsObserver,
       public content::WebContentsUserData<WebContentsModalDialogManager> {
  public:
   ~WebContentsModalDialogManager() override;
 
   WebContentsModalDialogManagerDelegate* delegate() const { return delegate_; }
   void SetDelegate(WebContentsModalDialogManagerDelegate* d);
 
   static SingleWebContentsDialogManager* CreateNativeWebModalManager(
-      NativeWebContentsModalDialog dialog,
+      gfx::NativeWindow dialog,
       SingleWebContentsDialogManagerDelegate* native_delegate);
 
   // Shows the dialog as a web contents modal dialog. The dialog will notify via
   // WillClose() when it is being destroyed.
-  void ShowModalDialog(NativeWebContentsModalDialog dialog);
+  void ShowModalDialog(gfx::NativeWindow dialog);
 
   // Allow clients to supply their own native dialog manager. Suitable for
   // bubble clients.
   void ShowDialogWithManager(
-      NativeWebContentsModalDialog dialog,
+      gfx::NativeWindow dialog,
       scoped_ptr<SingleWebContentsDialogManager> manager);
 
   // Returns true if any dialogs are active and not closed.
   bool IsDialogActive() const;
 
   // Focus the topmost modal dialog.  IsDialogActive() must be true when calling
   // this function.
   void FocusTopmostDialog() const;
 
   // SingleWebContentsDialogManagerDelegate:
   content::WebContents* GetWebContents() const override;
-  void WillClose(NativeWebContentsModalDialog dialog) override;
+  void WillClose(gfx::NativeWindow dialog) override;
 
   // For testing.
   class TestApi {
    public:
     explicit TestApi(WebContentsModalDialogManager* manager)
         : manager_(manager) {}
 
     void CloseAllDialogs() { manager_->CloseAllDialogs(); }
     void DidAttachInterstitialPage() { manager_->DidAttachInterstitialPage(); }
     void WebContentsWasShown() { manager_->WasShown(); }
     void WebContentsWasHidden() { manager_->WasHidden(); }
 
    private:
     WebContentsModalDialogManager* manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
  private:
   explicit WebContentsModalDialogManager(content::WebContents* web_contents);
   friend class content::WebContentsUserData<WebContentsModalDialogManager>;
   friend class PopupManager;
 
   struct DialogState {
-    DialogState(NativeWebContentsModalDialog dialog,
+    DialogState(gfx::NativeWindow dialog,
                 scoped_ptr<SingleWebContentsDialogManager> manager);
     ~DialogState();
 
-    NativeWebContentsModalDialog dialog;
+    gfx::NativeWindow dialog;
     scoped_ptr<SingleWebContentsDialogManager> manager;
   };
 
   typedef std::deque<DialogState*> WebContentsModalDialogList;
 
   // Utility function to get the dialog state for a dialog.
   WebContentsModalDialogList::iterator FindDialogState(
-      NativeWebContentsModalDialog dialog);
+      gfx::NativeWindow dialog);
 
   // Blocks/unblocks interaction with renderer process.
   void BlockWebContentsInteraction(bool blocked);
 
   bool IsWebContentsVisible() const;
 
   // Closes all WebContentsModalDialogs.
   void CloseAllDialogs();
 
   // Overridden from content::WebContentsObserver:
@@ skipping 14 matching lines @@
 
   // True while closing the dialogs on WebContents close.
   bool closing_all_dialogs_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogManager);
 };
 
 }  // namespace web_modal
 
 #endif  // COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_