Remove NativeWebContentsModalDialog and NativePopup typedefs.

chrome/browser/ui/views/web_contents_modal_dialog_manager_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 <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/platform_util.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/single_web_contents_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/border.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_modality_controller.h"
 #endif
 
-using web_modal::NativeWebContentsModalDialog;
 using web_modal::SingleWebContentsDialogManager;
 using web_modal::SingleWebContentsDialogManagerDelegate;
 using web_modal::WebContentsModalDialogHost;
 using web_modal::ModalDialogHostObserver;
 
 namespace {
 
 class NativeWebContentsModalDialogManagerViews
     : public SingleWebContentsDialogManager,
       public ModalDialogHostObserver,
       public views::WidgetObserver {
  public:
   NativeWebContentsModalDialogManagerViews(
-      NativeWebContentsModalDialog dialog,
+      gfx::NativeWindow dialog,
       SingleWebContentsDialogManagerDelegate* native_delegate)
       : native_delegate_(native_delegate),
         dialog_(dialog),
         host_(NULL) {
     ManageDialog();
   }
 
   ~NativeWebContentsModalDialogManagerViews() override {
     if (host_)
       host_->RemoveObserver(this);
@@ skipping 134 matching lines @@
            it != observed_widgets_.end();
            ++it) {
         views::Widget::ReparentNativeView((*it)->GetNativeView(),
                                           host_->GetHostView());
       }
 
       OnPositionRequiresUpdate();
     }
   }
 
-  NativeWebContentsModalDialog dialog() override { return dialog_; }
+  gfx::NativeWindow dialog() override { return dialog_; }
 
  private:
-  static views::Widget* GetWidget(NativeWebContentsModalDialog dialog) {
+  static views::Widget* GetWidget(gfx::NativeWindow dialog) {
     views::Widget* widget = views::Widget::GetWidgetForNativeWindow(dialog);
     DCHECK(widget);
     return widget;
   }
 
   void WidgetClosing(views::Widget* widget) {
 #if defined(USE_AURA)
     gfx::NativeView view = platform_util::GetParent(widget->GetNativeView());
     // Allow the parent to animate again.
     if (view && view->parent())
       view->parent()->ClearProperty(aura::client::kAnimationsDisabledKey);
 #endif
     widget->RemoveObserver(this);
     observed_widgets_.erase(widget);
 
 #if defined(USE_AURA)
     shown_widgets_.erase(widget);
 #endif
 
     // Will cause this object to be deleted.
     native_delegate_->WillClose(widget->GetNativeWindow());
   }
 
   SingleWebContentsDialogManagerDelegate* native_delegate_;
-  NativeWebContentsModalDialog dialog_;
+  gfx::NativeWindow dialog_;
   WebContentsModalDialogHost* host_;
   std::set<views::Widget*> observed_widgets_;
   std::set<views::Widget*> shown_widgets_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerViews);
 };
 
 }  // namespace
 
 namespace web_modal {
 
-SingleWebContentsDialogManager* WebContentsModalDialogManager::
-CreateNativeWebModalManager(
-    NativeWebContentsModalDialog dialog,
+SingleWebContentsDialogManager*
+WebContentsModalDialogManager::CreateNativeWebModalManager(
+    gfx::NativeWindow dialog,
     SingleWebContentsDialogManagerDelegate* native_delegate) {
   return new NativeWebContentsModalDialogManagerViews(dialog, native_delegate);
 }
 
 }  // namespace web_modal