Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1074)

Unified Diff: components/url_formatter/elide_url.h

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/url_formatter/elide_url.h
diff --git a/components/url_formatter/elide_url.h b/components/url_formatter/elide_url.h
index 5a05ceffa74ea7732ad4fee684207774a89d0684..335a69a255609e5f3d0cbda9a27ab9d62341aded 100644
--- a/components/url_formatter/elide_url.h
+++ b/components/url_formatter/elide_url.h
@@ -39,8 +39,7 @@ namespace url_formatter {
// http://crbug.com/6487 for more information.
base::string16 ElideUrl(const GURL& url,
const gfx::FontList& font_list,
- float available_pixel_width,
- const std::string& languages);
+ float available_pixel_width);
// This function takes a GURL object and elides the host to fit within
// the given width. The function will never elide past the TLD+1 point,
@@ -58,8 +57,8 @@ base::string16 ElideHost(const GURL& host_url,
// otherwise-simplified URLs from each other).
//
// Internationalized domain names (IDN) may be presented in Unicode if
-// |languages| accepts the Unicode representation (see
-// |url_formatter::FormatUrl| for more details on the algorithm).
+// they're regarded safe. See |url_formatter::FormatUrl| for more details on
+// the algorithm).
//
// - Omits the path for standard schemes, excepting file and filesystem.
// - Omits the port if it is the default for the scheme.
@@ -72,15 +71,12 @@ base::string16 ElideHost(const GURL& host_url,
// Chrome's Origin Info Bubble, there are icons and strings indicating origin
// (non-)security. But in the HTTP Basic Auth prompt (for example), the scheme
// may be the only indicator.
-base::string16 FormatUrlForSecurityDisplay(const GURL& origin,
- const std::string& languages);
+base::string16 FormatUrlForSecurityDisplay(const GURL& origin);
// Just like |FormatUrlForSecurityDisplay|, but also:
//
// - Omits the scheme if SchemeIsHTTPOrHTTPS().
-base::string16 FormatUrlForSecurityDisplayOmitScheme(
- const GURL& origin,
- const std::string& languages);
+base::string16 FormatUrlForSecurityDisplayOmitScheme(const GURL& origin);
} // namespace url_formatter

Powered by Google App Engine
This is Rietveld 408576698