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

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

Issue 8392017: Change string16 to std::string in the gfx::Font() interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add 'UTF-8' everywhere in the comments Created 9 years, 2 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/omnibox/omnibox_popup_view_mac_unittest.mm ('k') | chrome/common/badge_util.cc » ('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 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_);
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm ('k') | chrome/common/badge_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698