Commit ddb7bce3 authored by estade@chromium.org's avatar estade@chromium.org

[GTK] Don't line wrap on the extension uninstall dialog.

BUG=52781
TEST=see bug

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57126 0039d316-1c4b-4281-b951-d872f2087c98
parent c5da266f
// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
//
// Currently this file is only used for the uninstall prompt. The install prompt
// code is in extension_install_prompt2_gtk.cc.
#include <gtk/gtk.h> #include <gtk/gtk.h>
...@@ -20,8 +23,6 @@ class Profile; ...@@ -20,8 +23,6 @@ class Profile;
namespace { namespace {
const int kRightColumnWidth = 290;
// Left or right margin. // Left or right margin.
const int kPanelHorizMargin = 13; const int kPanelHorizMargin = 13;
...@@ -90,14 +91,10 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon, ...@@ -90,14 +91,10 @@ void ShowInstallPromptDialog(GtkWindow* parent, SkBitmap* skia_icon,
GtkWidget* heading_label = MakeMarkupLabel("<span weight=\"bold\">%s</span>", GtkWidget* heading_label = MakeMarkupLabel("<span weight=\"bold\">%s</span>",
heading_text); heading_text);
gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
gtk_label_set_selectable(GTK_LABEL(heading_label), TRUE);
gtk_box_pack_start(GTK_BOX(right_column_area), heading_label, TRUE, TRUE, 0); 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()); GtkWidget* warning_label = gtk_label_new(UTF16ToUTF8(warning_text).c_str());
gtk_label_set_line_wrap(GTK_LABEL(warning_label), TRUE);
gtk_widget_set_size_request(warning_label, kRightColumnWidth, -1);
gtk_misc_set_alignment(GTK_MISC(warning_label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(warning_label), 0.0, 0.5);
gtk_label_set_selectable(GTK_LABEL(warning_label), TRUE);
gtk_box_pack_start(GTK_BOX(right_column_area), warning_label, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(right_column_area), warning_label, TRUE, TRUE, 0);
g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), delegate); g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), delegate);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment