| Index: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/extensions/extension_install_dialog_view.cc (revision 104083)
|
| +++ chrome/browser/ui/views/extensions/extension_install_dialog_view.cc (working copy)
|
| @@ -162,8 +162,8 @@
|
|
|
| layout->StartRow(0, column_set_id);
|
|
|
| - views::Label* heading = new views::Label(
|
| - prompt.GetHeading(extension->name()));
|
| + views::Label* heading = new views::Label(UTF16ToWide(
|
| + prompt.GetHeading(extension->name())));
|
| heading->SetFont(heading->font().DeriveFont(kHeadingFontSizeDelta,
|
| gfx::Font::BOLD));
|
| heading->SetMultiLine(true);
|
| @@ -199,7 +199,8 @@
|
| layout->AddView(rating);
|
| prompt.AppendRatingStars(AddResourceIcon, rating);
|
|
|
| - views::Label* rating_count = new views::Label(prompt.GetRatingCount());
|
| + views::Label* rating_count = new views::Label(
|
| + UTF16ToWide(prompt.GetRatingCount()));
|
| rating_count->SetFont(
|
| rating_count->font().DeriveFont(kRatingFontSizeDelta));
|
| // Add some space between the stars and the rating count.
|
| @@ -207,14 +208,15 @@
|
| rating->AddChildView(rating_count);
|
|
|
| layout->StartRow(0, column_set_id);
|
| - views::Label* user_count = new views::Label(prompt.GetUserCount());
|
| + views::Label* user_count = new views::Label(
|
| + UTF16ToWide(prompt.GetUserCount()));
|
| user_count->SetColor(SK_ColorGRAY);
|
| user_count->SetFont(user_count->font().DeriveFont(kRatingFontSizeDelta));
|
| layout->AddView(user_count);
|
|
|
| layout->StartRow(0, column_set_id);
|
| - views::Link* store_link = new views::Link(
|
| - l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK));
|
| + views::Link* store_link = new views::Link(UTF16ToWide(
|
| + l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_STORE_LINK)));
|
| store_link->SetFont(store_link->font().DeriveFont(kRatingFontSizeDelta));
|
| store_link->set_listener(this);
|
| layout->AddView(store_link);
|
| @@ -231,8 +233,8 @@
|
| }
|
|
|
| layout->StartRow(0, column_set_id);
|
| - views::Label* permissions_header = new views::Label(
|
| - prompt.GetPermissionsHeader());
|
| + views::Label* permissions_header = new views::Label(UTF16ToWide(
|
| + prompt.GetPermissionsHeader()));
|
| permissions_header->SetMultiLine(true);
|
| permissions_header->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
|
| permissions_header->SizeToFit(left_column_width);
|
| @@ -242,7 +244,7 @@
|
| layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
|
| layout->StartRow(0, column_set_id);
|
| views::Label* permission_label = new views::Label(
|
| - prompt.GetPermission(i));
|
| + UTF16ToWide(prompt.GetPermission(i)));
|
| permission_label->SetMultiLine(true);
|
| permission_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
|
| permission_label->SizeToFit(left_column_width);
|
|
|