Fix bookmark editor regression and host hung monitor dialog.

- Fix bookmark editor size regression because the controls on it are
  not visible and caused gtk_util::ShowDialog get the wrong size;
- Host hung monitor dialog in a Chrome window as other dialogs;

BUG=none
TEST=Verify "Add Page" or "Edit" bookmark dialog shows up correctly and verify that hung monitor shows up in a chrome window instead of full screen.

Review URL: http://codereview.chromium.org/2808021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50599 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 1 deletions

diff --git a/chrome/browser/gtk/gtk_util.cc b/chrome/browser/gtk/gtk_util.cc
index 2c5ab6b..1bca63ed 100644
--- a/chrome/browser/gtk/gtk_util.cc
+++ b/chrome/browser/gtk/gtk_util.cc
@@ -934,6 +934,10 @@ GtkWindow* GetDialogTransientParent(GtkWindow* dialog) {
 }
 
 void ShowDialog(GtkWidget* dialog) {
+  // Make sure all controls are visible so that we get correct size.
+  gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
+
+  // Get dialog window size.
   gint width = 0;
   gint height = 0;
   gtk_window_get_size(GTK_WINDOW(dialog), &width, &height);
diff --git a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
index f52a60b..f17915a 100644
--- a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
@@ -168,7 +168,7 @@ void HungRendererDialogGtk::ShowForTabContents(TabContents* hung_contents) {
         g_object_unref(pixbuf);
     }
   }
-  gtk_widget_show_all(GTK_WIDGET(dialog_));
+  gtk_util::ShowDialog(GTK_WIDGET(dialog_));
 }
 
 void HungRendererDialogGtk::EndForTabContents(TabContents* contents) {