| Index: ui/events/keycodes/keyboard_code_conversion_x.cc
|
| diff --git a/ui/events/keycodes/keyboard_code_conversion_x.cc b/ui/events/keycodes/keyboard_code_conversion_x.cc
|
| index 74854942d4ccdb0b634c73588917615efe696a13..60714f2fa82f5465f44b63639f82ea514b95f01d 100644
|
| --- a/ui/events/keycodes/keyboard_code_conversion_x.cc
|
| +++ b/ui/events/keycodes/keyboard_code_conversion_x.cc
|
| @@ -448,7 +448,7 @@ uint16 GetCharacterFromXEvent(XEvent* xev) {
|
| int bytes_written = XLookupString(&xev->xkey, buf, 6, NULL, NULL);
|
| DCHECK_LE(bytes_written, 6);
|
|
|
| - string16 result;
|
| + base::string16 result;
|
| return (bytes_written > 0 && UTF8ToUTF16(buf, bytes_written, &result) &&
|
| result.length() == 1) ? result[0] : 0;
|
| }
|
|
|