diff options
| author | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 02:16:32 +0000 |
|---|---|---|
| committer | mhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 02:16:32 +0000 |
| commit | a23de85783d944cbb75f09737eb29c60ea87481d (patch) | |
| tree | 30c4732b42443259134a3f83f574bfaa2a506292 /chrome/browser/bookmarks | |
| parent | 1b5237ecc1fea39e51e1634acbcdf11bd7ef57b0 (diff) | |
| download | chromium_src-a23de85783d944cbb75f09737eb29c60ea87481d.zip chromium_src-a23de85783d944cbb75f09737eb29c60ea87481d.tar.gz chromium_src-a23de85783d944cbb75f09737eb29c60ea87481d.tar.bz2 | |
Local text file with spaces in filename is urlencoded in tab title
When viewing a local text file with spaces in filename, it is still urlencoded. Filename should be displayed with spaces, not with urlencoding. It would be more user-friendly.
Since net::FormatURL is already implemented, using it would be great. But it doesn't escape SPACES, just NORMAL, it doesn't even escape unicode. I plumbed out a unescapeurl that could be used whether we allow conversion of spaces or not.
BUG=8775 (http://crbug.com/8775)
TEST=Tested whether the input is escaped in the navigational context and ran the net tests
New Review: http://codereview.chromium.org/118059
Review URL: http://codereview.chromium.org/56053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17462 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_table_model.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc index 44978ce..4ff6a57 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.cc +++ b/chrome/browser/bookmarks/bookmark_table_model.cc @@ -18,6 +18,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "net/base/escape.h" #include "net/base/net_util.h" #if defined(TOOLKIT_VIEWS) @@ -326,7 +327,8 @@ std::wstring BookmarkTableModel::GetText(int row, int column_id) { ? model_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages) : std::wstring(); std::wstring url_text = - net::FormatUrl(node->GetURL(), languages, false, true, NULL, NULL); + net::FormatUrl(node->GetURL(), languages, false, UnescapeRule::SPACES, + NULL, NULL); if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) l10n_util::WrapStringWithLTRFormatting(&url_text); return url_text; |