Implement WebContentsModalDialogManagerDelegate for ShellWindow

chrome/browser/ui/gtk/extensions/native_app_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/extensions/native_app_window_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ skipping 269 matching lines @@
 
   int left_inset = current_x - rect_with_decorations.x;
   int top_inset = current_y - rect_with_decorations.y;
   return gfx::Insets(
       top_inset,
       left_inset,
       rect_with_decorations.height - current_height - top_inset,
       rect_with_decorations.width - current_width - left_inset);
 }
 
+gfx::Point NativeAppWindowGtk::GetDialogPosition(const gfx::Size& size) {
+  gint current_width = 0;
+  gint current_height = 0;
+  gtk_window_get_size(window_, &current_width, &current_height);
+  return gfx::Point(current_width / 2 - size.width() / 2,
+                    current_height / 2 - size.height() / 2);
+}
+
+void NativeAppWindowGtk::AddObserver(
+    WebContentsModalDialogHostObserver* observer) {
+  observer_list_.AddObserver(observer);
+}
+
+void NativeAppWindowGtk::RemoveObserver(
+    WebContentsModalDialogHostObserver* observer) {
+  observer_list_.RemoveObserver(observer);
+}
+
 void NativeAppWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
   // Do nothing if we're in the process of closing the browser window.
   if (!window_)
     return;
 
   is_active_ = gtk_widget_get_window(GTK_WIDGET(window_)) == active_window;
 }
 
 // Callback for the delete event.  This event is fired when the user tries to
 // close the window (e.g., clicking on the X in the window manager title bar).
@@ skipping 29 matching lines @@
   window_configure_debounce_timer_.Start(FROM_HERE,
       base::TimeDelta::FromMilliseconds(kDebounceTimeoutMilliseconds), this,
       &NativeAppWindowGtk::OnDebouncedBoundsChanged);
 
   return FALSE;
 }
 
 void NativeAppWindowGtk::OnDebouncedBoundsChanged() {
   gtk_window_util::UpdateWindowPosition(this, &bounds_, &restored_bounds_);
   shell_window_->OnNativeWindowChanged();
+
+  FOR_EACH_OBSERVER(WebContentsModalDialogHostObserver,
+                    observer_list_,
+                    OnPositionRequiresUpdate());

[jeremya, 2013/04/04 19:59:17]

This code could live in OnNativeWindowChanged(), I think.

[Mike Wittman, 2013/04/04 22:56:08]

See comment in the .h file.  Also, OnNativeWindowChanged() is invoked in
multiple circumstances, only some of which necessitate a position change for the
web contents modal dialog.

 }
 
 gboolean NativeAppWindowGtk::OnWindowState(GtkWidget* sender,
                                            GdkEventWindowState* event) {
   state_ = event->new_window_state;
 
   if (content_thinks_its_fullscreen_ &&
       !(state_ & GDK_WINDOW_STATE_FULLSCREEN)) {
     content_thinks_its_fullscreen_ = false;
     content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
@@ skipping 141 matching lines @@
 
   draggable_region_.reset(ShellWindow::RawDraggableRegionsToSkRegion(regions));
 }
 
 // static
 NativeAppWindow* NativeAppWindow::Create(
     ShellWindow* shell_window,
     const ShellWindow::CreateParams& params) {
   return new NativeAppWindowGtk(shell_window, params);
 }