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

Unified Diff: chrome/common/badge_util.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « no previous file | chrome/common/child_process_logging_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/badge_util.cc
diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc
index 81bb6f362ea5fb0d8622c9deabf19e73b69c9d83..14210410e7c7735088ba4a532b1f199a41d159b0 100644
--- a/chrome/common/badge_util.cc
+++ b/chrome/common/badge_util.cc
@@ -103,7 +103,7 @@ SkBitmap DrawBadgeIconOverlay(const SkBitmap& icon,
paint->setTextSize(SkFloatToScalar(font_size));
paint->setColor(SK_ColorWHITE);
- std::string badge_text = UTF16ToUTF8(text);
+ std::string badge_text = base::UTF16ToUTF8(text);
// See if the text will fit - otherwise use a default.
SkScalar text_width = paint->measureText(badge_text.c_str(),
@@ -111,7 +111,7 @@ SkBitmap DrawBadgeIconOverlay(const SkBitmap& icon,
if (SkScalarRound(text_width) > (icon.width() - kMinPadding * 2)) {
// String is too large - use the alternate text.
- badge_text = UTF16ToUTF8(fallback);
+ badge_text = base::UTF16ToUTF8(fallback);
text_width = paint->measureText(badge_text.c_str(), badge_text.size());
}
« no previous file with comments | « no previous file | chrome/common/child_process_logging_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698