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

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

Issue 7686015: ui: Pass the parameter |languages| of StatusBubble::SetURL() as std::string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 4 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: 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 a790cd1ce10c0178ffcd7444e9ee291ea19a402b..1d05d9899e34acb7d6703fb9e3c428b2c3876f1c 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.mm
@@ -125,7 +125,7 @@ void StatusBubbleMac::SetStatus(const string16& status) {
SetText(status, false);
}
-void StatusBubbleMac::SetURL(const GURL& url, const string16& languages) {
+void StatusBubbleMac::SetURL(const GURL& url, const std::string& languages) {
url_ = url;
languages_ = languages;
@@ -150,9 +150,8 @@ void StatusBubbleMac::SetURL(const GURL& url, const string16& languages) {
gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),
[font pointSize]);
- string16 original_url_text = net::FormatUrl(url, UTF16ToUTF8(languages));
- string16 status = ui::ElideUrl(url, font_chr, text_width,
- UTF16ToUTF8(languages));
+ string16 original_url_text = net::FormatUrl(url, languages);
+ string16 status = ui::ElideUrl(url, font_chr, text_width, languages);
SetText(status, true);
@@ -607,8 +606,8 @@ void StatusBubbleMac::ExpandBubble() {
NSFont* font = [[window_ contentView] font];
gfx::Font font_chr(base::SysNSStringToUTF16([font fontName]),
[font pointSize]);
- string16 expanded_url = ui::ElideUrl(url_, font_chr,
- max_bubble_width, UTF16ToUTF8(languages_));
+ string16 expanded_url = ui::ElideUrl(
+ url_, font_chr, max_bubble_width, languages_);
// Scale width from gfx::Font in view coordinates to window coordinates.
int required_width_for_string =

Powered by Google App Engine
This is Rietveld 408576698