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

Unified Diff: chrome/browser/ui/gtk/status_bubble_gtk.cc

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/gtk/status_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/status_bubble_gtk.cc b/chrome/browser/ui/gtk/status_bubble_gtk.cc
index fb548be79bdf8b0d21027b373ca28e56b8c634db..6ca34353d2fbc959232e82ee700058b4a4a2c8a2 100644
--- a/chrome/browser/ui/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/status_bubble_gtk.cc
@@ -73,7 +73,7 @@ void StatusBubbleGtk::SetStatus(const string16& status_text_wide) {
SetStatusTextTo(std::string());
}
-void StatusBubbleGtk::SetURL(const GURL& url, const string16& languages) {
+void StatusBubbleGtk::SetURL(const GURL& url, const std::string& languages) {
url_ = url;
languages_ = languages;
@@ -107,8 +107,8 @@ void StatusBubbleGtk::SetStatusTextToURL() {
// TODO(tc): We don't actually use gfx::Font as the font in the status
// bubble. We should extend ui::ElideUrl to take some sort of pango font.
- url_text_ = UTF16ToUTF8(ui::ElideUrl(url_, gfx::Font(), desired_width,
- UTF16ToUTF8(languages_)));
+ url_text_ = UTF16ToUTF8(
+ ui::ElideUrl(url_, gfx::Font(), desired_width, languages_));
SetStatusTextTo(url_text_);
}

Powered by Google App Engine
This is Rietveld 408576698