Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/webui/constrained_web_dialog_ui.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_CONSTRAINED_WEB_DIALOG_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_
 
 #include "base/compiler_specific.h"
-#include "components/web_modal/native_web_contents_modal_dialog.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace content {
 class BrowserContext;
 class RenderViewHost;
@@ skipping 16 matching lines @@
 
   // If called, on dialog closure, the dialog will release its WebContents
   // instead of destroying it. After which point, the caller will own the
   // released WebContents.
   virtual void ReleaseWebContentsOnDialogClose() = 0;
 
   // Returns the WebContents owned by the constrained window.
   virtual content::WebContents* GetWebContents() = 0;
 
   // Returns the native type used to display the dialog.
-  virtual web_modal::NativeWebContentsModalDialog GetNativeDialog() = 0;
+  virtual gfx::NativeWindow GetNativeDialog() = 0;
 
   // Returns the minimum size for the dialog.
   virtual gfx::Size GetMinimumSize() const = 0;
 
   // Returns the maximum size for the dialog.
   virtual gfx::Size GetMaximumSize() const = 0;
 
   virtual gfx::Size GetPreferredSize() const = 0;
 
  protected:
@@ skipping 51 matching lines @@
 // |min_size| is the minimum size of the dialog.
 // |max_size| is the maximum size of the dialog.
 ConstrainedWebDialogDelegate* ShowConstrainedWebDialogWithAutoResize(
     content::BrowserContext* browser_context,
     ui::WebDialogDelegate* delegate,
     content::WebContents* overshadowed,
     const gfx::Size& min_size,
     const gfx::Size& max_size);
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_UI_H_