Index: ui/base/ime/input_method_win.cc |
diff --git a/ui/base/ime/input_method_win.cc b/ui/base/ime/input_method_win.cc |
index ef500a7f3eb4ef33986940ce4c5b455b4866252a..4349263c5c33abab4dcc3a669c5964ce7f80181f 100644 |
--- a/ui/base/ime/input_method_win.cc |
+++ b/ui/base/ime/input_method_win.cc |
@@ -14,7 +14,7 @@ |
#include "ui/events/event_constants.h" |
#include "ui/events/event_utils.h" |
#include "ui/events/keycodes/keyboard_codes.h" |
-#include "ui/gfx/win/dpi.h" |
+#include "ui/gfx/screen_win.h" |
#include "ui/gfx/win/hwnd_util.h" |
namespace ui { |
@@ -197,7 +197,8 @@ void InputMethodWin::OnCaretBoundsChanged(const TextInputClient* client) { |
// Tentatively assume that the returned value is DIP (Density Independent |
// Pixel). See the comment in text_input_client.h and http://crbug.com/360334. |
const gfx::Rect dip_screen_bounds(GetTextInputClient()->GetCaretBounds()); |
- const gfx::Rect screen_bounds = gfx::win::DIPToScreenRect(dip_screen_bounds); |
+ const gfx::Rect screen_bounds = gfx::ScreenWin::DIPToScreenRect( |
+ toplevel_window_handle_, dip_screen_bounds); |
HWND attached_window = toplevel_window_handle_; |
// TODO(ime): see comment in TextInputClient::GetCaretBounds(), this |
@@ -570,7 +571,8 @@ LRESULT InputMethodWin::OnQueryCharPosition(IMECHARPOSITION* char_positon) { |
return 0; |
dip_rect = client->GetCaretBounds(); |
} |
- const gfx::Rect rect = gfx::win::DIPToScreenRect(dip_rect); |
+ const gfx::Rect rect = |
+ gfx::ScreenWin::DIPToScreenRect(toplevel_window_handle_, dip_rect); |
char_positon->pt.x = rect.x(); |
char_positon->pt.y = rect.y(); |