| Index: ui/base/ime/win/imm32_manager.cc
|
| diff --git a/ui/base/ime/win/imm32_manager.cc b/ui/base/ime/win/imm32_manager.cc
|
| index 093b01093667ecad8833dabe55fd62715271598e..23f1d9d0f8b71a5a23f3dbb1df306fb28acf7f4e 100644
|
| --- a/ui/base/ime/win/imm32_manager.cc
|
| +++ b/ui/base/ime/win/imm32_manager.cc
|
| @@ -368,7 +368,7 @@ void IMM32Manager::GetCompositionInfo(HIMC imm_context, LPARAM lparam,
|
| bool IMM32Manager::GetString(HIMC imm_context,
|
| WPARAM lparam,
|
| int type,
|
| - string16* result) {
|
| + base::string16* result) {
|
| if (!(lparam & type))
|
| return false;
|
| LONG string_size = ::ImmGetCompositionString(imm_context, type, NULL, 0);
|
| @@ -381,7 +381,7 @@ bool IMM32Manager::GetString(HIMC imm_context,
|
| }
|
|
|
| bool IMM32Manager::GetResult(
|
| - HWND window_handle, LPARAM lparam, string16* result) {
|
| + HWND window_handle, LPARAM lparam, base::string16* result) {
|
| bool ret = false;
|
| HIMC imm_context = ::ImmGetContext(window_handle);
|
| if (imm_context) {
|
|
|