| Index: chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| index 0ab1d575d2411bf25ce12ae2fd1fe9685034c8dc..e03e3f9d6718be56b2324de11712a29187110877 100644
|
| --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
|
| @@ -124,19 +124,14 @@ void ToggleBookmarkBarWhenVisible(content::BrowserContext* browser_context) {
|
| prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, always_show);
|
| }
|
|
|
| -base::string16 FormatBookmarkURLForDisplay(const GURL& url,
|
| - const PrefService* prefs) {
|
| - std::string languages;
|
| - if (prefs)
|
| - languages = prefs->GetString(prefs::kAcceptLanguages);
|
| -
|
| +base::string16 FormatBookmarkURLForDisplay(const GURL& url) {
|
| // Because this gets re-parsed by FixupURL(), it's safe to omit the scheme
|
| // and trailing slash, and unescape most characters. However, it's
|
| // important not to drop any username/password, or unescape anything that
|
| // changes the URL's meaning.
|
| return url_formatter::FormatUrl(
|
| - url, languages, url_formatter::kFormatUrlOmitAll &
|
| - ~url_formatter::kFormatUrlOmitUsernamePassword,
|
| + url, url_formatter::kFormatUrlOmitAll &
|
| + ~url_formatter::kFormatUrlOmitUsernamePassword,
|
| net::UnescapeRule::SPACES, nullptr, nullptr, nullptr);
|
| }
|
|
|
|
|