Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2)

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 50ade413d54b02f13a14d7c5dc1d6a951ee77962..1504e4b57b8731d25cbe716644b70247d36f9be9 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
@@ -5,11 +5,11 @@
 #include "chrome/browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h"
 
 #include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.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/constrained_window_views.h"
 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -68,15 +68,15 @@ bool ChromeWebContentsViewDelegateViews::Focus() {
     }
   }
 
-  ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-  if (constrained_window_tab_helper) {
-    // TODO(erg): WebContents used to own constrained windows, which is why
-    // this is here. Eventually this should be ported to a containing view
-    // specializing in constrained window management.
-    if (constrained_window_tab_helper->dialog_count() > 0) {
-      ConstrainedWindow* window =
-          *constrained_window_tab_helper->dialog_begin();
+  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->dialog_count() > 0) {
+      WebContentsModalDialog* window =
+          *web_contents_modal_dialog_manager->dialog_begin();
       DCHECK(window);
       window->FocusWebContentsModalDialog();
       return true;