summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/gtk_util.cc
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 15:46:42 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-23 15:46:42 +0000
commit0726fe5b3345623dab4f28e6e46d473d7e2b95cf (patch)
treeaf39206e2371a8f43ce2b447f46d0c6e69072904 /chrome/browser/gtk/gtk_util.cc
parent7de8b1873902cb8857a27ae6b0b6d5b5291d62b0 (diff)
downloadchromium_src-0726fe5b3345623dab4f28e6e46d473d7e2b95cf.zip
chromium_src-0726fe5b3345623dab4f28e6e46d473d7e2b95cf.tar.gz
chromium_src-0726fe5b3345623dab4f28e6e46d473d7e2b95cf.tar.bz2
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
Diffstat (limited to 'chrome/browser/gtk/gtk_util.cc')
-rw-r--r--chrome/browser/gtk/gtk_util.cc4
1 files changed, 4 insertions, 0 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);