Add a confirmation prompt to app uninstallation on the ntp.

chrome/browser/gtk/extension_install_prompt_gtk.cc

Index: chrome/browser/gtk/extension_install_prompt_gtk.cc
diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc
index 12566173678f9b951906cd0fb989109d9a2631d1..45efdc79080a1f7156afd7c46960ed90a4458a10 100644
--- a/chrome/browser/gtk/extension_install_prompt_gtk.cc
+++ b/chrome/browser/gtk/extension_install_prompt_gtk.cc
@@ -26,18 +26,6 @@ namespace {
 // Left or right margin.
 const int kPanelHorizMargin = 13;
 
-GtkWidget* MakeMarkupLabel(const char* format, const std::string& str) {
-  GtkWidget* label = gtk_label_new(NULL);
-  char* markup = g_markup_printf_escaped(format, str.c_str());
-  gtk_label_set_markup(GTK_LABEL(label), markup);
-  g_free(markup);
-
-  // Left align it.
-  gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-  return label;
-}
-
 void OnDialogResponse(GtkDialog* dialog, int response_id,
                       ExtensionInstallUI::Delegate* delegate) {
   if (response_id == GTK_RESPONSE_ACCEPT) {
@@ -52,7 +40,6 @@ void OnDialogResponse(GtkDialog* dialog, int response_id,
 void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon,
                              Extension *extension,
                              ExtensionInstallUI::Delegate *delegate,
-                             const string16& warning_text,
                              ExtensionInstallUI::PromptType type) {
   // Build the dialog.
   int title_id = ExtensionInstallUI::kTitleIds[type];
@@ -88,15 +75,10 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon,
   int heading_id = ExtensionInstallUI::kHeadingIds[type];
   std::string heading_text = l10n_util::GetStringFUTF8(
       heading_id, UTF8ToUTF16(extension->name()));
-  GtkWidget* heading_label = MakeMarkupLabel("<span weight=\"bold\">%s</span>",
-                                             heading_text);
+  GtkWidget* heading_label = gtk_label_new(heading_text.c_str());
   gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
   gtk_box_pack_start(GTK_BOX(right_column_area), heading_label, TRUE, TRUE, 0);
 
-  GtkWidget* warning_label = gtk_label_new(UTF16ToUTF8(warning_text).c_str());
-  gtk_misc_set_alignment(GTK_MISC(warning_label), 0.0, 0.5);
-  gtk_box_pack_start(GTK_BOX(right_column_area), warning_label, TRUE, TRUE, 0);
-
   g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), delegate);
   gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
   gtk_widget_show_all(dialog);
@@ -106,7 +88,7 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon,
 
 void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl(
     Profile* profile, Delegate* delegate, Extension* extension, SkBitmap* icon,
-    const string16& warning_text, ExtensionInstallUI::PromptType type) {
+    ExtensionInstallUI::PromptType type) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
   if (!browser) {
     delegate->InstallUIAbort();
@@ -120,6 +102,6 @@ void ExtensionInstallUI::ShowExtensionInstallUIPromptImpl(
     return;
   }
 
-  ShowInstallPromptDialog(browser_window->window(), icon, extension,
-      delegate, warning_text, type);
+  ShowInstallPromptDialog(browser_window->window(), icon, extension, delegate,
+                          type);
 }