| Index: chrome/browser/ui/gtk/download/download_item_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
|
| index 15789d9b8e67632855f8ac3e92fc974badd8a993..570b0580ae54119b8ce25bae34ddcd77f39da5da 100644
|
| --- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
|
| @@ -240,7 +240,8 @@ DownloadItemGtk::DownloadItemGtk(DownloadShelfGtk* parent_shelf,
|
| // Create the ok button, if this is the kind that can be bypassed.
|
| if (!download_model_.IsMalicious()) {
|
| GtkWidget* dangerous_accept = gtk_button_new_with_label(
|
| - UTF16ToUTF8(download_model_.GetWarningConfirmButtonText()).c_str());
|
| + base::UTF16ToUTF8(
|
| + download_model_.GetWarningConfirmButtonText()).c_str());
|
| g_signal_connect(dangerous_accept, "clicked",
|
| G_CALLBACK(OnDangerousAcceptThunk), this);
|
| gtk_util::CenterWidgetInHBox(
|
| @@ -366,7 +367,7 @@ void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download_item) {
|
| NOTREACHED();
|
| }
|
|
|
| - status_text_ = UTF16ToUTF8(download_model_.GetStatusText());
|
| + status_text_ = base::UTF16ToUTF8(download_model_.GetStatusText());
|
| UpdateStatusLabel(status_text_);
|
| }
|
|
|
| @@ -485,7 +486,8 @@ void DownloadItemGtk::UpdateTooltip() {
|
| ui::ResourceBundle::BaseFont);
|
| base::string16 tooltip_text =
|
| download_model_.GetTooltipText(font_list, kTooltipMaxWidth);
|
| - gtk_widget_set_tooltip_text(body_.get(), UTF16ToUTF8(tooltip_text).c_str());
|
| + gtk_widget_set_tooltip_text(body_.get(),
|
| + base::UTF16ToUTF8(tooltip_text).c_str());
|
| }
|
|
|
| void DownloadItemGtk::UpdateNameLabel() {
|
| @@ -517,7 +519,7 @@ void DownloadItemGtk::UpdateNameLabel() {
|
| name_label_,
|
| theme_service_->UsingNativeTheme() ? NULL : &color);
|
| gtk_label_set_text(GTK_LABEL(name_label_),
|
| - UTF16ToUTF8(filename).c_str());
|
| + base::UTF16ToUTF8(filename).c_str());
|
| }
|
|
|
| void DownloadItemGtk::UpdateStatusLabel(const std::string& status_text) {
|
| @@ -596,7 +598,7 @@ void DownloadItemGtk::UpdateDangerWarning() {
|
| }
|
|
|
| gtk_label_set_text(GTK_LABEL(dangerous_label_),
|
| - UTF16ToUTF8(dangerous_warning).c_str());
|
| + base::UTF16ToUTF8(dangerous_warning).c_str());
|
|
|
| // Until we switch to vector graphics, force the font size.
|
| gtk_util::ForceFontSizePixels(dangerous_label_, kTextSize);
|
|
|