Update dialog parent handling logic.

chrome/browser/gtk/gtk_util.cc

 // Copyright (c) 2010 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/gtk/gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <cstdarg>
@@ skipping 907 matching lines @@
   GdkScreen* screen = gtk_widget_get_screen(window);
   GdkColormap* rgba = gdk_screen_get_rgba_colormap(screen);
   if (rgba)
     gtk_widget_set_colormap(window, rgba);
 
   return rgba;
 }
 
 #if defined(OS_CHROMEOS)
 
+GtkWindow* GetDialogTransientParent(GtkWindow* dialog) {
+  GtkWindow* parent = gtk_window_get_transient_for(dialog);
+  if (!parent)
+    parent = chromeos::GetOptionsViewParent();
+
+  return parent;
+}
+
 void ShowDialog(GtkWidget* dialog) {
-  chromeos::ShowNativeDialog(chromeos::GetOptionsViewParent(),
+  chromeos::ShowNativeDialog(GetDialogTransientParent(GTK_WINDOW(dialog)),
       dialog, chromeos::DIALOG_FLAG_DEFAULT, gfx::Size(), gfx::Size());
 }
 
 void ShowDialogWithLocalizedSize(GtkWidget* dialog,
                                  int width_id,
                                  int height_id,
                                  bool resizeable) {
   int width = (width_id == -1) ? 0 :
       views::Window::GetLocalizedContentsWidth(width_id);
   int height = (height_id == -1) ? 0 :
       views::Window::GetLocalizedContentsHeight(height_id);
 
-  chromeos::ShowNativeDialog(chromeos::GetOptionsViewParent(),
+  chromeos::ShowNativeDialog(GetDialogTransientParent(GTK_WINDOW(dialog)),
       dialog,
       resizeable ? chromeos::DIALOG_FLAG_RESIZEABLE :
                    chromeos::DIALOG_FLAG_DEFAULT,
       gfx::Size(width, height),
       gfx::Size());
 }
 
 void ShowModalDialogWithMinLocalizedWidth(GtkWidget* dialog,
                                           int width_id) {
   int width = (width_id == -1) ? 0 :
       views::Window::GetLocalizedContentsWidth(width_id);
 
-  chromeos::ShowNativeDialog(chromeos::GetOptionsViewParent(),
+  chromeos::ShowNativeDialog(GetDialogTransientParent(GTK_WINDOW(dialog)),
       dialog,
       chromeos::DIALOG_FLAG_MODAL,
       gfx::Size(),
       gfx::Size(width, 0));
 }
 
 void PresentWindow(GtkWidget* window, int timestamp) {
   GtkWindow* host_window = chromeos::GetNativeDialogWindow(window);
   if (!host_window)
       host_window = GTK_WINDOW(window);
   if (timestamp)
     gtk_window_present_with_time(host_window, timestamp);
   else
     gtk_window_present(host_window);
 }
 
+GtkWindow* GetDialogWindow(GtkWidget* dialog) {
+  return chromeos::GetNativeDialogWindow(dialog);
+}
+
 #else
 
 void ShowDialog(GtkWidget* dialog) {
   gtk_widget_show_all(dialog);
 }
 
 void ShowDialogWithLocalizedSize(GtkWidget* dialog,
                                  int width_id,
                                  int height_id,
                                  bool resizeable) {
@@ skipping 18 matching lines @@
     gtk_widget_set_size_request(dialog, width, -1);
 }
 
 void PresentWindow(GtkWidget* window, int timestamp) {
   if (timestamp)
     gtk_window_present_with_time(GTK_WINDOW(window), timestamp);
   else
     gtk_window_present(GTK_WINDOW(window));
 }
 
+GtkWindow* GetDialogWindow(GtkWidget* dialog) {
+  return dialog;
+}
+
 #endif
 
 }  // namespace gtk_util