Revert "[WebModals] New API for browser-scoped popup management."

chrome/browser/ui/views/constrained_window_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/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
 #include "chrome/browser/ui/browser_finder.h"
-#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 "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "ui/views/border.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using web_modal::ModalDialogHost;
 using web_modal::ModalDialogHostObserver;
 
 namespace {
 // The name of a key to store on the window handle to associate
@@ skipping 101 matching lines @@
     views::WidgetDelegate* dialog,
     content::WebContents* initiator_web_contents) {
   extensions::WebViewGuest* web_view_guest =
       extensions::WebViewGuest::FromWebContents(initiator_web_contents);
   // For embedded WebContents, use the embedder's WebContents for constrained
   // window.
   content::WebContents* web_contents =
       web_view_guest && web_view_guest->embedder_web_contents() ?
           web_view_guest->embedder_web_contents() : initiator_web_contents;
   views::Widget* widget = CreateWebModalDialogViews(dialog, web_contents);
-  web_modal::PopupManager* popup_manager =
-      web_modal::PopupManager::FromWebContents(web_contents);
-  popup_manager->ShowModalDialog(widget->GetNativeWindow(), web_contents);
+  web_modal::WebContentsModalDialogManager::FromWebContents(web_contents)->
+      ShowModalDialog(widget->GetNativeWindow());
   return widget;
 }
 
 views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
                                          content::WebContents* web_contents) {
   DCHECK_EQ(ui::MODAL_TYPE_CHILD, dialog->GetModalType());
-  web_modal::PopupManager* popup_manager =
-      web_modal::PopupManager::FromWebContents(web_contents);
-  const gfx::NativeWindow parent = popup_manager->GetHostView();
+  web_modal::WebContentsModalDialogManager* manager =
+      web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);
+  const gfx::NativeWindow parent =
+      manager->delegate()->GetWebContentsModalDialogHost()->GetHostView();
   return views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent);
 }
 
-// TODO(gbillock): Replace this with PopupManager calls.
 views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
                                              gfx::NativeWindow parent) {
   views::Widget* widget =
       views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent);
   if (!dialog->UseNewStyleForThisDialog())
     return widget;
 
   // Get the browser dialog management and hosting components from |parent|.
   Browser* browser = chrome::FindBrowserWithWindow(parent);
   if (browser) {
     ChromeWebModalDialogManagerDelegate* manager = browser;
     ModalDialogHost* host = manager->GetWebContentsModalDialogHost();
     DCHECK_EQ(parent, host->GetHostView());
     ModalDialogHostObserver* dialog_host_observer =
         new BrowserModalDialogHostObserverViews(
             host, widget, kBrowserModalDialogHostObserverViewsKey);
     dialog_host_observer->OnPositionRequiresUpdate();
   }
   return widget;
 }