diff options
| author | Yukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 16:32:02 +0000 |
|---|---|---|
| committer | Yukawa@chromium.org <Yukawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-26 16:32:02 +0000 |
| commit | b24af195cc684297fe553e51c5742983aa2357fc (patch) | |
| tree | 92b2a5f49a86c2a40d538f7aefe6d907a145ee90 /ui/views/widget/native_widget_win.cc | |
| parent | 134f963ddd1b7fa723e91d7dac786203951554bf (diff) | |
| download | chromium_src-b24af195cc684297fe553e51c5742983aa2357fc.zip chromium_src-b24af195cc684297fe553e51c5742983aa2357fc.tar.gz chromium_src-b24af195cc684297fe553e51c5742983aa2357fc.tar.bz2 | |
Enable InputMethodBridge for Views on Windows.
With this CL, NativeWidgetWin starts using InputMethodBridge
instead of InputMethodWin to conform the expected design
of Views framework.
This CL only affects non-Aura Windows build because
NativeWidgetWin is not used in Aura build.
TBR=sky
BUG=246534, 246516
TEST=Manually done on Windows 7 with built-in Japanese MS-IME
Review URL: https://chromiumcodereview.appspot.com/17413012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget/native_widget_win.cc')
| -rw-r--r-- | ui/views/widget/native_widget_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 1cca1be..1f31349 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -19,6 +19,7 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/base/events/event.h" +#include "ui/base/ime/input_method_factory.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/theme_provider.h" @@ -41,7 +42,7 @@ #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/view_storage.h" #include "ui/views/focus/widget_focus_manager.h" -#include "ui/views/ime/input_method_win.h" +#include "ui/views/ime/input_method_bridge.h" #include "ui/views/widget/aero_tooltip_manager.h" #include "ui/views/widget/drop_target_win.h" #include "ui/views/widget/monitor_win.h" @@ -211,7 +212,8 @@ bool NativeWidgetWin::HasCapture() const { } InputMethod* NativeWidgetWin::CreateInputMethod() { - return new InputMethodWin(GetMessageHandler(), GetNativeWindow(), NULL); + return new InputMethodBridge(GetMessageHandler(), ui::GetSharedInputMethod(), + true); } internal::InputMethodDelegate* NativeWidgetWin::GetInputMethodDelegate() { |