| 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 73f23328fcda5e5a0f151c69cbf2919e01326b0c..5bf6500b749b83cf318172393117e2a9d16e6464 100644
|
| --- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
|
| @@ -148,7 +148,7 @@ void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
|
| scaled_width = [[parent_ contentView] convertSize:scaled_width fromView:nil];
|
| text_width = static_cast<int>(scaled_width.width);
|
| NSFont* font = [[window_ contentView] font];
|
| - gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),
|
| + gfx::Font font_chr(base::SysNSStringToUTF8([font fontName]),
|
| [font pointSize]);
|
|
|
| string16 original_url_text = net::FormatUrl(url, languages);
|
| @@ -609,7 +609,7 @@ void StatusBubbleMac::ExpandBubble() {
|
|
|
| // Generate the URL string that fits in the expanded bubble.
|
| NSFont* font = [[window_ contentView] font];
|
| - gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),
|
| + gfx::Font font_chr(base::SysNSStringToUTF8([font fontName]),
|
| [font pointSize]);
|
| string16 expanded_url = ui::ElideUrl(
|
| url_, font_chr, max_bubble_width, languages_);
|
|
|