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

chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc

Index: chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
diff --git a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
index 1b9d752eeb5974aa5dd5dd2dd04f6ae7f2e298e1..32703941462aa3758cdf5b5006dd4d608ede8b09 100644
--- a/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
+++ b/chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc
@@ -6,12 +6,13 @@
 
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/sad_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
 #include "chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.h"
 #include "chrome/browser/ui/views/sad_tab_view.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "components/web_modal/popup_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ -23,8 +24,6 @@
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/widget/widget.h"
 
-using web_modal::WebContentsModalDialogManager;
-
 ChromeWebContentsViewDelegateViews::ChromeWebContentsViewDelegateViews(
     content::WebContents* web_contents)
     : ContextMenuDelegate(web_contents),
@@ -61,17 +60,9 @@ bool ChromeWebContentsViewDelegateViews::Focus() {
     }
   }
 
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents_);
-  if (web_contents_modal_dialog_manager) {
-    // TODO(erg): WebContents used to own web contents modal dialogs, which is
-    // why this is here. Eventually this should be ported to a containing view
-    // specializing in web contents modal dialog management.
-    if (web_contents_modal_dialog_manager->IsDialogActive()) {
-      web_contents_modal_dialog_manager->FocusTopmostDialog();
-      return true;
-    }
-  }
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
+  if (browser && browser->popup_manager())

[Mike Wittman, 2014/06/25 02:38:50]

Why not PopupManager::FromWebContents()?

[Greg Billock, 2014/06/25 19:06:14]

Done.

+    browser->popup_manager()->WasFocused(web_contents_);
 
   return false;
 }