Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/views/constrained_web_dialog_delegate_views.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/constrained_web_dialog_delegate_base.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
@@ skipping 106 matching lines @@
 
   // contents::WebContentsDelegate:
   void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) override {
     unhandled_keyboard_event_handler_.HandleKeyboardEvent(
         event, view_->GetFocusManager());
   }
 
   // ConstrainedWebDialogDelegate:
-  web_modal::NativeWebContentsModalDialog GetNativeDialog() override {
+  gfx::NativeWindow GetNativeDialog() override {
     return view_->GetWidget()->GetNativeWindow();
   }
 
  private:
   // Converts keyboard events on the WebContents to accelerators.
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   views::WebView* view_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateViews);
@@ skipping 28 matching lines @@
   }
   ui::WebDialogDelegate* GetWebDialogDelegate() override {
     return impl_->GetWebDialogDelegate();
   }
   void OnDialogCloseFromWebUI() override {
     return impl_->OnDialogCloseFromWebUI();
   }
   void ReleaseWebContentsOnDialogClose() override {
     return impl_->ReleaseWebContentsOnDialogClose();
   }
-  web_modal::NativeWebContentsModalDialog GetNativeDialog() override {
+  gfx::NativeWindow GetNativeDialog() override {
     return impl_->GetNativeDialog();
   }
   content::WebContents* GetWebContents() override {
     return impl_->GetWebContents();
   }
 
   // views::WidgetDelegate:
   views::View* GetInitiallyFocusedView() override { return this; }
   void WindowClosing() override {
     if (!impl_->closed_via_webui())
@@ skipping 105 matching lines @@
     const gfx::Size& max_size) {
   DCHECK(!min_size.IsEmpty());
   DCHECK(!max_size.IsEmpty());
   ConstrainedWebDialogDelegateViewViews* dialog =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, web_contents,
           min_size, max_size);
   constrained_window::CreateWebModalDialogViews(dialog, web_contents);
   return dialog;
 }