summaryrefslogtreecommitdiffstats
path: root/chrome/common/badge_util.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/badge_util.cc')
-rw-r--r--chrome/common/badge_util.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc
index bd2067c..21746b0 100644
--- a/chrome/common/badge_util.cc
+++ b/chrome/common/badge_util.cc
@@ -4,12 +4,12 @@
#include "chrome/common/badge_util.h"
-#include "app/resource_bundle.h"
#include "base/utf_string_conversions.h"
-#include "gfx/canvas_skia.h"
-#include "gfx/font.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkTypeface.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/font.h"
namespace badge_util {
@@ -40,7 +40,7 @@ SkPaint* GetBadgeTextPaintSingleton() {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
typeface = SkTypeface::CreateFromName(
- WideToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
+ UTF16ToUTF8(base_font.GetFontName()).c_str(), SkTypeface::kNormal);
}
text_paint->setTypeface(typeface);