summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/views/dropdown_button.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/views/dropdown_button.cc')
-rw-r--r--chrome/browser/chromeos/views/dropdown_button.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/views/dropdown_button.cc b/chrome/browser/chromeos/views/dropdown_button.cc
index 7d37f9e..f29e0c3 100644
--- a/chrome/browser/chromeos/views/dropdown_button.cc
+++ b/chrome/browser/chromeos/views/dropdown_button.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/chromeos/views/dropdown_button.h"
-#include "base/utf_string_conversions.h"
#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas_skia.h"
@@ -78,8 +77,8 @@ void DropDownButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
height() - kFocusFrameBottomOffset);
}
-void DropDownButton::SetText(const std::wstring& text) {
- text_ = WideToUTF16Hack(text);
+void DropDownButton::SetText(const string16& text) {
+ text_ = text;
UpdateTextSize();
}