diff options
| -rw-r--r-- | chrome/browser/gtk/download_item_gtk.cc | 6 | ||||
| -rw-r--r-- | net/base/net_util.cc | 13 |
2 files changed, 6 insertions, 13 deletions
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index f64b30f..b74951b 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -548,7 +548,7 @@ void DownloadItemGtk::UpdateStatusLabel(GtkWidget* status_label, gtk_util::SetLabelColor(status_label, theme_provider_->UseGtkTheme() ? NULL : &text_color); - gtk_label_set_text(GTK_LABEL(status_label), status_text.c_str()); + gtk_label_set_label(GTK_LABEL(status_label), status_text.c_str()); } void DownloadItemGtk::UpdateDangerWarning() { @@ -583,8 +583,8 @@ void DownloadItemGtk::UpdateDangerWarning() { gtk_util::SetLabelColor(dangerous_label_, &color); } - gtk_label_set_text(GTK_LABEL(dangerous_label_), - WideToUTF8(dangerous_warning).c_str()); + gtk_label_set_label(GTK_LABEL(dangerous_label_), + WideToUTF8(dangerous_warning).c_str()); // Until we switch to vector graphics, force the font size. gtk_util::ForceFontSizePixels(dangerous_label_, kTextSize); diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 490feab..60f626d4 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1081,7 +1081,7 @@ FilePath GetSuggestedFilename(const GURL& url, } const std::string filename_from_cd = GetFileNameFromCD(content_disposition, - referrer_charset); + referrer_charset); #if defined(OS_WIN) FilePath::StringType filename = UTF8ToWide(filename_from_cd); #elif defined(OS_POSIX) @@ -1102,17 +1102,10 @@ FilePath GetSuggestedFilename(const GURL& url, const std::string unescaped_url_filename = UnescapeURLComponent( url.ExtractFileName(), UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS); - - // The URL should be escaped UTF-8, but may not be. - std::string decoded_filename; - bool ignore; - DecodeWord(unescaped_url_filename, referrer_charset, &ignore, - &decoded_filename); - #if defined(OS_WIN) - filename = UTF8ToWide(decoded_filename); + filename = UTF8ToWide(unescaped_url_filename); #elif defined(OS_POSIX) - filename = decoded_filename; + filename = unescaped_url_filename; #endif } } |