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

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"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
-#include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/tab_contents/chrome_web_contents_view_delegate_gtk.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/gtk/focus_store_gtk.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 
 using content::BrowserThread;
 
 ConstrainedWindowGtkDelegate::~ConstrainedWindowGtkDelegate() {
 }
@@ skipping 40 matching lines @@
   border_.Own(ebox);
 
   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->AddDialog(this);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents_);
+  web_contents_modal_dialog_manager->AddDialog(this);
 }
 
 ConstrainedWindowGtk::~ConstrainedWindowGtk() {
   border_.Destroy();
 }
 
 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::CloseWebContentsModalDialog() {
   if (visible_)
     ContainingView()->RemoveConstrainedWindow(this);
   delegate_->DeleteDelegate();
-  ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-  constrained_window_tab_helper->WillClose(this);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents_);
+  web_contents_modal_dialog_manager->WillClose(this);
 
   delete this;
 }
 
 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()) &&
+  WebContentsModalDialogManager* manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents_);
+  if ((!manager->delegate() ||
+       manager->delegate()->ShouldFocusWebContentsModalDialog()) &&
       gtk_util::IsWidgetAncestryVisible(focus_widget)) {
     gtk_widget_grab_focus(focus_widget);
   } else {
     ContainingView()->focus_store()->SetWidget(focus_widget);
   }
 }
 
+void ConstrainedWindowGtk::PulseWebContentsModalDialog() {
+}
+
+bool ConstrainedWindowGtk::CanShowWebContentsModalDialog() {
+  return true;
+}
+
+gfx::NativeWindow ConstrainedWindowGtk::GetNativeWindow() {
+  return GTK_WINDOW(gtk_widget_get_toplevel(widget()));
+}
+
 void ConstrainedWindowGtk::BackgroundColorChanged() {
   GdkColor background;
   if (delegate_->GetBackgroundColor(&background)) {
     gtk_widget_modify_base(border_.get(), GTK_STATE_NORMAL, &background);
     gtk_widget_modify_fg(border_.get(), GTK_STATE_NORMAL, &background);
     gtk_widget_modify_bg(border_.get(), GTK_STATE_NORMAL, &background);
   }
 }
 
 ConstrainedWindowGtk::TabContentsViewType*
@@ skipping 17 matching lines @@
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!gtk_widget_is_toplevel(gtk_widget_get_toplevel(widget())))
     return;
 
   FocusWebContentsModalDialog();
 }