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

Unified Diff: chrome/browser/chromeos/drop_shadow_label.cc

Issue 6134010: Revert 71167 - Remove wstring from gfx.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/chromeos/dom_ui/menu_ui.cc ('k') | chrome/browser/chromeos/login/oobe_progress_bar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drop_shadow_label.cc
===================================================================
--- chrome/browser/chromeos/drop_shadow_label.cc (revision 71168)
+++ chrome/browser/chromeos/drop_shadow_label.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/chromeos/drop_shadow_label.h"
-#include "base/utf_string_conversions.h"
#include "gfx/canvas.h"
#include "gfx/color_utils.h"
@@ -45,19 +44,19 @@
SkColorGetG(kDefaultColor),
SkColorGetB(kDefaultColor));
for (int i = 0; i < drop_shadow_size_; i++) {
- canvas->DrawStringInt(WideToUTF16Hack(text), font(), color,
+ canvas->DrawStringInt(text, font(), color,
text_bounds.x() + i, text_bounds.y(),
text_bounds.width(), text_bounds.height(), flags);
- canvas->DrawStringInt(WideToUTF16Hack(text), font(), color,
+ canvas->DrawStringInt(text, font(), color,
text_bounds.x() + i, text_bounds.y() + i,
text_bounds.width(), text_bounds.height(), flags);
- canvas->DrawStringInt(WideToUTF16Hack(text), font(), color,
+ canvas->DrawStringInt(text, font(), color,
text_bounds.x(), text_bounds.y() + i,
text_bounds.width(), text_bounds.height(), flags);
}
}
- canvas->DrawStringInt(WideToUTF16Hack(text), font(), GetColor(),
+ canvas->DrawStringInt(text, font(), GetColor(),
text_bounds.x(), text_bounds.y(),
text_bounds.width(), text_bounds.height(), flags);
Property changes on: chrome/browser/chromeos/drop_shadow_label.cc
___________________________________________________________________
Deleted: svn:eol-style
- LF
« no previous file with comments | « chrome/browser/chromeos/dom_ui/menu_ui.cc ('k') | chrome/browser/chromeos/login/oobe_progress_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698