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

Unified Diff: chrome/browser/ui/cocoa/status_bubble_mac.mm

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 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
« no previous file with comments | « chrome/browser/ui/cocoa/status_bubble_mac.h ('k') | chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/status_bubble_mac.mm
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.mm b/chrome/browser/ui/cocoa/status_bubble_mac.mm
index 653e333cc869f6169761ec94b8a0fa6fa3e9c1ac..a688b6d21ea04721df6d6b43e61e317c7cb138e0 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -202,9 +202,8 @@ void StatusBubbleMac::SetStatus(const base::string16& status) {
SetText(status, false);
}
-void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
+void StatusBubbleMac::SetURL(const GURL& url) {
url_ = url;
- languages_ = languages;
CGFloat bubble_width = NSWidth([window_ frame]);
if (state_ == kBubbleHidden) {
@@ -236,9 +235,9 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
gfx::FontList font_list_chr(
gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font)));
- base::string16 original_url_text = url_formatter::FormatUrl(url, languages);
+ base::string16 original_url_text = url_formatter::FormatUrl(url);
base::string16 status =
- url_formatter::ElideUrl(url, font_list_chr, text_width, languages);
+ url_formatter::ElideUrl(url, font_list_chr, text_width);
SetText(status, true);
@@ -709,7 +708,7 @@ void StatusBubbleMac::ExpandBubble() {
gfx::FontList font_list_chr(
gfx::Font(gfx::PlatformFont::CreateFromNativeFont(font)));
base::string16 expanded_url = url_formatter::ElideUrl(
- url_, font_list_chr, max_bubble_width, languages_);
+ url_, font_list_chr, max_bubble_width);
// Scale width from gfx::Font in view coordinates to window coordinates.
int required_width_for_string =
« no previous file with comments | « chrome/browser/ui/cocoa/status_bubble_mac.h ('k') | chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698