page info dialog polish:

GTK:
- set default size of contents, rather than window as a whole---this gets line wrapping right.
All:
- change title string to Title Case instead of Sentence case
- fix Connection text for mixed/unsafe content

BUG=28507

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

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

3 files changed, 8 insertions, 9 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2efa902..7936ec4 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3797,7 +3797,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- Page Information Window -->
       <message name="IDS_PAGEINFO_WINDOW_TITLE" desc="Title of the page info window.">
-        Security information
+        Security Information
       </message>
       <message name="IDS_PAGEINFO_CERT_INFO_BUTTON" desc="Text of button in the page info that shows the SSL certificate.">
         Certificate information...
diff --git a/chrome/browser/gtk/page_info_window_gtk.cc b/chrome/browser/gtk/page_info_window_gtk.cc
index cd1c92c..d6cb526 100644
--- a/chrome/browser/gtk/page_info_window_gtk.cc
+++ b/chrome/browser/gtk/page_info_window_gtk.cc
@@ -81,7 +81,6 @@ PageInfoWindowGtk::PageInfoWindowGtk(gfx::NativeWindow parent,
       GTK_STOCK_CLOSE,
       GTK_RESPONSE_CLOSE,
       NULL);
-  gtk_window_set_default_size(GTK_WINDOW(dialog_), 500, -1);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
                       gtk_util::kContentAreaSpacing);
   g_signal_connect(dialog_, "response", G_CALLBACK(OnDialogResponse), NULL);
@@ -122,15 +121,16 @@ GtkWidget* PageInfoWindowGtk::CreateSection(
   if (!section.head_line.empty()) {
     label = gtk_label_new(UTF16ToUTF8(section.head_line).c_str());
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
-    gtk_box_pack_start(GTK_BOX(text_box), label , FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(text_box), label, FALSE, FALSE, 0);
   }
   label = gtk_label_new(UTF16ToUTF8(section.description).c_str());
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-  gtk_box_pack_start(GTK_BOX(text_box), label , FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(text_box), label, FALSE, FALSE, 0);
+  gtk_widget_set_size_request(label, 400, -1);
 
-  gtk_box_pack_start(GTK_BOX(section_box), text_box , TRUE, TRUE, 0);
-  gtk_box_pack_start(GTK_BOX(vbox), section_box , TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(section_box), text_box, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), section_box, TRUE, TRUE, 0);
 
   return vbox;
 }
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index a949094..44090a5 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -39,7 +39,6 @@ PageInfoModel::PageInfoModel(Profile* profile,
   bool state = true;
   string16 head_line;
   string16 description;
-  string16 connection_msg;
   scoped_refptr<net::X509Certificate> cert;
 
   // Identity section.
@@ -140,7 +139,7 @@ PageInfoModel::PageInfoModel(Profile* profile,
       description.assign(
           l10n_util::GetStringFUTF16(
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,
-              connection_msg,
+              description,
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING)));
     } else if (ssl.has_unsafe_content()) {
@@ -148,7 +147,7 @@ PageInfoModel::PageInfoModel(Profile* profile,
       description.assign(
           l10n_util::GetStringFUTF16(
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,
-              connection_msg,
+              description,
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_BAD_HTTPS_WARNING)));
     }