Put more dialogs into chrome window.

- Bookmark entry editor;
- GtkInputWindowDialog;
- Cert manager and viewer;
- Task manager;

BUG=None.
TEST=Verify bookmark new/rename folder, add page, task manager, cert manager and viewer are inside a chrome window.

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

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

7 files changed, 12 insertions, 9 deletions

diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index a54c037..d2de0ae 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -224,7 +224,7 @@ void BookmarkEditorGtk::Show() {
   // Manually call our OnEntryChanged handler to set the initial state.
   OnEntryChanged(NULL);
 
-  gtk_widget_show_all(dialog_);
+  gtk_util::ShowDialog(dialog_);
 }
 
 void BookmarkEditorGtk::Close() {
diff --git a/chrome/browser/gtk/certificate_manager.cc b/chrome/browser/gtk/certificate_manager.cc
index 9b9c03e..5ce3543 100644
--- a/chrome/browser/gtk/certificate_manager.cc
+++ b/chrome/browser/gtk/certificate_manager.cc
@@ -262,9 +262,11 @@ void CertificatePage::PopulateTree(CERTCertList* cert_list) {
       gtk_tree_store_append(store_, &iter, &org_tree_map_iter->second);
       gtk_tree_store_set(store_, &iter,
                          CERT_NAME, name.c_str(),
-                         CERT_SECURITY_DEVICE, psm::GetCertTokenName(cert).c_str(),
+                         CERT_SECURITY_DEVICE,
+                         psm::GetCertTokenName(cert).c_str(),
                          CERT_SERIAL_NUMBER,
-                         Stringize(CERT_Hexify(&cert->serialNumber, TRUE)).c_str(),
+                         Stringize(CERT_Hexify(
+                             &cert->serialNumber, TRUE)).c_str(),
                          CERT_ADDRESS, cert->emailAddr,
                          CERT_POINTER, cert,
                          -1);
@@ -439,7 +441,7 @@ CertificateManager::~CertificateManager() {
 }
 
 void CertificateManager::Show() {
-  gtk_widget_show_all(dialog_);
+  gtk_util::ShowDialog(dialog_);
 }
 
 } // namespace
diff --git a/chrome/browser/gtk/certificate_viewer.cc b/chrome/browser/gtk/certificate_viewer.cc
index e6caff7..779fe58 100644
--- a/chrome/browser/gtk/certificate_viewer.cc
+++ b/chrome/browser/gtk/certificate_viewer.cc
@@ -719,7 +719,7 @@ void CertificateViewer::OnExportClicked(GtkButton *button,
 }
 
 void CertificateViewer::Show() {
-  gtk_widget_show_all(dialog_);
+  gtk_util::ShowDialog(dialog_);
 }
 
 } // namespace
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index 022468d..d4e91c6 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -905,7 +905,7 @@ void PrivacySection::ShowRestartMessageBox() const {
       l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str());
   g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy),
                            dialog);
-  gtk_widget_show_all(dialog);
+  gtk_util::ShowDialog(dialog);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index dcdf53b..62ebcfd 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -591,7 +591,7 @@ void ContentPageGtk::OnSyncStartStopButtonClicked(GtkWidget* widget) {
     g_signal_connect(dialog, "response",
                      G_CALLBACK(OnStopSyncDialogResponseThunk), this);
 
-    gtk_widget_show_all(dialog);
+    gtk_util::ShowDialog(dialog);
     return;
   } else {
     sync_service_->EnableForUser();
diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc
index 93ed4ca..d655e6e 100644
--- a/chrome/browser/gtk/task_manager_gtk.cc
+++ b/chrome/browser/gtk/task_manager_gtk.cc
@@ -456,7 +456,7 @@ void TaskManagerGtk::Init() {
   gtk_container_add(GTK_CONTAINER(scrolled), treeview_);
 
   SetInitialDialogSize();
-  gtk_widget_show_all(dialog_);
+  gtk_util::ShowDialog(dialog_);
 
   model_->AddObserver(this);
 }
diff --git a/chrome/browser/input_window_dialog_gtk.cc b/chrome/browser/input_window_dialog_gtk.cc
index 1a00312..3e61894 100644
--- a/chrome/browser/input_window_dialog_gtk.cc
+++ b/chrome/browser/input_window_dialog_gtk.cc
@@ -10,6 +10,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/gtk/gtk_util.h"
 
 class GtkInputWindowDialog : public InputWindowDialog {
  public:
@@ -94,7 +95,7 @@ GtkInputWindowDialog::~GtkInputWindowDialog() {
 }
 
 void GtkInputWindowDialog::Show() {
-  gtk_widget_show(GTK_WIDGET(dialog_));
+  gtk_util::ShowDialog(dialog_);
 }
 
 void GtkInputWindowDialog::Close() {