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

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 772fc896f9572a5eaeaac43995b16bb6d3219a1b..50ade413d54b02f13a14d7c5dc1d6a951ee77962 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
@@ -74,11 +74,11 @@ bool ChromeWebContentsViewDelegateViews::Focus() {
     // 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->constrained_window_count() > 0) {
+    if (constrained_window_tab_helper->dialog_count() > 0) {
       ConstrainedWindow* window =
-          *constrained_window_tab_helper->constrained_window_begin();
+          *constrained_window_tab_helper->dialog_begin();
       DCHECK(window);
-      window->FocusConstrainedWindow();
+      window->FocusWebContentsModalDialog();
       return true;
     }
   }