[gtk] fix title wrapping on extension install dialog

chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc

 // Copyright (c) 2012 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 <gtk/gtk.h>
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
@@ skipping 133 matching lines @@
   // Divide the dialog vertically (item data and icon on the top, permissions
   // on the bottom).
   GtkWidget* content_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(content_area), content_vbox, TRUE, TRUE, 0);
 
   // Create a two column layout for the top (item data on the left, icon on
   // the right).
   GtkWidget* top_content_hbox = gtk_hbox_new(FALSE, ui::kContentAreaSpacing);
   gtk_box_pack_start(GTK_BOX(content_vbox), top_content_hbox, TRUE, TRUE, 0);
 
+  // We don't show the image for bunle installs, so let the left column take up
+  // that space.
+  const int left_column_min_width =
+      kLeftColumnMinWidth + (is_bundle_install ? kImageSize : 0);
+
   // Create a new vbox for the left column.
   GtkWidget* left_column_area = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(top_content_hbox), left_column_area,
                      TRUE, TRUE, 0);
-  gtk_widget_set_size_request(left_column_area, kLeftColumnMinWidth, -1);
+  gtk_widget_set_size_request(left_column_area, left_column_min_width, -1);
 
   GtkWidget* heading_vbox = gtk_vbox_new(FALSE, 0);
   // If we are not going to show anything else, vertically center the title.
   bool center_heading =
       !show_permissions && !show_oauth_issues && !is_inline_install;
   gtk_box_pack_start(GTK_BOX(left_column_area), heading_vbox, center_heading,
                      center_heading, 0);
 
   // Heading
   GtkWidget* heading_label = gtk_util::CreateBoldLabel(
       UTF16ToUTF8(prompt.GetHeading().c_str()));
-  gtk_label_set_line_wrap(GTK_LABEL(heading_label), true);
-  gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
+  gtk_util::SetLabelWidth(heading_label, left_column_min_width);
   gtk_box_pack_start(GTK_BOX(heading_vbox), heading_label, center_heading,
                      center_heading, 0);
 
   if (is_inline_install) {
     // Average rating (as stars) and number of ratings.
     GtkWidget* stars_hbox = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(heading_vbox), stars_hbox, FALSE, FALSE, 0);
     prompt.AppendRatingStars(AddResourceIcon, stars_hbox);
     GtkWidget* rating_label = gtk_label_new(UTF16ToUTF8(
         prompt.GetRatingCount()).c_str());
     gtk_util::ForceFontSizePixels(rating_label, kRatingTextSize);
     gtk_box_pack_start(GTK_BOX(stars_hbox), rating_label,
                        FALSE, FALSE, 3);
 
     // User count.
     GtkWidget* users_label = gtk_label_new(UTF16ToUTF8(
         prompt.GetUserCount()).c_str());
-    gtk_util::SetLabelWidth(users_label, kLeftColumnMinWidth);
+    gtk_util::SetLabelWidth(users_label, left_column_min_width);
     gtk_util::SetLabelColor(users_label, &ui::kGdkGray);
     gtk_util::ForceFontSizePixels(rating_label, kRatingTextSize);
     gtk_box_pack_start(GTK_BOX(heading_vbox), users_label,
                        FALSE, FALSE, 0);
 
     // Store link.
     GtkWidget* store_link = gtk_chrome_link_button_new(
         l10n_util::GetStringUTF8(IDS_EXTENSION_PROMPT_STORE_LINK).c_str());
     gtk_util::ForceFontSizePixels(store_link, kRatingTextSize);
     GtkWidget* store_link_hbox = gtk_hbox_new(FALSE, 0);
     // Stick it in an hbox so it doesn't expand to the whole width.
     gtk_box_pack_start(GTK_BOX(store_link_hbox), store_link, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(heading_vbox), store_link_hbox, FALSE, FALSE, 0);
     g_signal_connect(store_link, "clicked",
                      G_CALLBACK(OnStoreLinkClickThunk), this);
   }
 
   if (is_bundle_install) {
     // Add the list of extensions to be installed.
     GtkWidget* extensions_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
     gtk_box_pack_start(GTK_BOX(heading_vbox), extensions_vbox, FALSE, FALSE,
                        ui::kControlSpacing);
 
     BundleInstaller::ItemList items = prompt.bundle()->GetItemsWithState(
         BundleInstaller::Item::STATE_PENDING);
     for (size_t i = 0; i < items.size(); ++i) {
       GtkWidget* extension_label = gtk_label_new(UTF16ToUTF8(
           items[i].GetNameForDisplay()).c_str());
-      gtk_util::SetLabelWidth(extension_label, kLeftColumnMinWidth);
+      gtk_util::SetLabelWidth(extension_label, left_column_min_width);
       gtk_box_pack_start(GTK_BOX(extensions_vbox), extension_label,
                          FALSE, FALSE, kExtensionsPadding);
     }
   } else {
     // Resize the icon if necessary.
     SkBitmap scaled_icon = *prompt.icon().ToSkBitmap();
     if (scaled_icon.width() > kImageSize || scaled_icon.height() > kImageSize) {
       scaled_icon = skia::ImageOperations::Resize(
           scaled_icon, skia::ImageOperations::RESIZE_LANCZOS3,
           kImageSize, kImageSize);
@@ skipping 16 matching lines @@
     if (is_inline_install) {
       permissions_container = content_vbox;
       gtk_box_pack_start(GTK_BOX(content_vbox), gtk_hseparator_new(),
                          FALSE, FALSE, ui::kControlSpacing);
     } else {
       permissions_container = left_column_area;
     }
 
     GtkWidget* permissions_header = gtk_util::CreateBoldLabel(
         UTF16ToUTF8(prompt.GetPermissionsHeading()).c_str());
-    gtk_util::SetLabelWidth(permissions_header, kLeftColumnMinWidth);
+    gtk_util::SetLabelWidth(permissions_header, left_column_min_width);
     gtk_box_pack_start(GTK_BOX(permissions_container), permissions_header,
                        FALSE, FALSE, 0);
 
     for (size_t i = 0; i < prompt.GetPermissionCount(); ++i) {
       std::string permission = l10n_util::GetStringFUTF8(
           IDS_EXTENSION_PERMISSION_LINE, prompt.GetPermission(i));
       GtkWidget* permission_label = gtk_label_new(permission.c_str());
-      gtk_util::SetLabelWidth(permission_label, kLeftColumnMinWidth);
+      gtk_util::SetLabelWidth(permission_label, left_column_min_width);
       gtk_box_pack_start(GTK_BOX(permissions_container), permission_label,
                          FALSE, FALSE, kPermissionsPadding);
     }
   }
 
   if (show_oauth_issues) {
     // If permissions are shown, then the scopes will go below them and take
     // up the entire width of the dialog. Otherwise the scopes will go where
     // the permissions usually go.
     GtkWidget* oauth_issues_container =
         show_permissions ? content_vbox : left_column_area;
-    int pixel_width = kLeftColumnMinWidth +
+    int pixel_width = left_column_min_width +
         (show_permissions ? kImageSize : 0);
 
     GtkWidget* oauth_issues_header = gtk_util::CreateBoldLabel(
         UTF16ToUTF8(prompt.GetOAuthHeading()).c_str());
     gtk_util::SetLabelWidth(oauth_issues_header, pixel_width);
     gtk_box_pack_start(GTK_BOX(oauth_issues_container), oauth_issues_header,
                        FALSE, FALSE, 0);
 
     for (size_t i = 0; i < prompt.GetOAuthIssueCount(); ++i) {
       GtkWidget* issue_advice_widget =
@@ skipping 93 matching lines @@
 
 }  // namespace browser
 
 void ShowExtensionInstallDialogImpl(
     gfx::NativeWindow parent,
     content::PageNavigator* navigator,
     ExtensionInstallPrompt::Delegate* delegate,
     const ExtensionInstallPrompt::Prompt& prompt) {
   new browser::ExtensionInstallDialog(parent, navigator, delegate, prompt);
 }