summaryrefslogtreecommitdiffstats
path: root/chrome/test/chromedriver/keycode_text_conversion_x.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/chromedriver/keycode_text_conversion_x.cc')
-rw-r--r--chrome/test/chromedriver/keycode_text_conversion_x.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/chromedriver/keycode_text_conversion_x.cc b/chrome/test/chromedriver/keycode_text_conversion_x.cc
index 5b89935..7cf3b32 100644
--- a/chrome/test/chromedriver/keycode_text_conversion_x.cc
+++ b/chrome/test/chromedriver/keycode_text_conversion_x.cc
@@ -180,7 +180,7 @@ bool GetXModifierMask(Display* display, int modifier, int* x_modifier) {
std::string ConvertKeyCodeToText(ui::KeyboardCode key_code, int modifiers) {
int x_key_code = KeyboardCodeToXKeyCode(key_code);
if (x_key_code == -1)
- return "";
+ return std::string();
XEvent event;
memset(&event, 0, sizeof(XEvent));
@@ -211,7 +211,7 @@ std::string ConvertKeyCodeToText(ui::KeyboardCode key_code, int modifiers) {
uint16 character = ui::GetCharacterFromXEvent(&event);
if (!character)
- return "";
+ return std::string();
return UTF16ToUTF8(string16(1, character));
}