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

chrome/browser/ui/gtk/constrained_window_gtk.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/gtk/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 57 matching lines @@
   BackgroundColorChanged();
 
   gtk_widget_add_events(widget(), GDK_KEY_PRESS_MASK);
   g_signal_connect(widget(), "key-press-event", G_CALLBACK(OnKeyPressThunk),
                    this);
   g_signal_connect(widget(), "hierarchy-changed",
                    G_CALLBACK(OnHierarchyChangedThunk), this);
 
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-  constrained_window_tab_helper->AddConstrainedDialog(this);
+  constrained_window_tab_helper->AddDialog(this);
 }
 
 ConstrainedWindowGtk::~ConstrainedWindowGtk() {
   border_.Destroy();
 }
 
-void ConstrainedWindowGtk::ShowConstrainedWindow() {
+void ConstrainedWindowGtk::ShowWebContentsModalDialog() {
   gtk_widget_show_all(border_.get());
 
   // We collaborate with WebContentsView and stick ourselves in the
   // WebContentsView's floating container.
   ContainingView()->AttachConstrainedWindow(this);
 
   visible_ = true;
 }
 
-void ConstrainedWindowGtk::CloseConstrainedWindow() {
+void ConstrainedWindowGtk::CloseWebContentsModalDialog() {
   if (visible_)
     ContainingView()->RemoveConstrainedWindow(this);
   delegate_->DeleteDelegate();
   ConstrainedWindowTabHelper* constrained_window_tab_helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   constrained_window_tab_helper->WillClose(this);
 
   delete this;
 }
 
-void ConstrainedWindowGtk::FocusConstrainedWindow() {
+void ConstrainedWindowGtk::FocusWebContentsModalDialog() {
   GtkWidget* focus_widget = delegate_->GetFocusWidget();
   if (!focus_widget)
     return;
 
   // The user may have focused another tab. In this case do not grab focus
   // until this tab is refocused.
   ConstrainedWindowTabHelper* helper =
       ConstrainedWindowTabHelper::FromWebContents(web_contents_);
   if ((!helper->delegate() ||
        helper->delegate()->ShouldFocusConstrainedWindow()) &&
@@ skipping 18 matching lines @@
   return ChromeWebContentsViewDelegateGtk::GetFor(web_contents_);
 }
 
 gboolean ConstrainedWindowGtk::OnKeyPress(GtkWidget* sender,
                                           GdkEventKey* key) {
   if (key->keyval == GDK_Escape) {
     // Let the stack unwind so the event handler can release its ref
     // on widget().
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(&ConstrainedWindowGtk::CloseConstrainedWindow,
+        base::Bind(&ConstrainedWindowGtk::CloseWebContentsModalDialog,
                    weak_factory_.GetWeakPtr()));
     return TRUE;
   }
 
   return FALSE;
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
     return;
 
-  FocusConstrainedWindow();
+  FocusWebContentsModalDialog();
 }