diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 08:31:51 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 08:31:51 +0000 |
| commit | 5dc0cc7bf9cb2f5e6b050933d1ebe7852b10baa0 (patch) | |
| tree | 07f0620ffd0821ef0718d576edf5b415225ff76b /views | |
| parent | 67039c734e08c5c1b04f8bc1a98c81dc675bd7ab (diff) | |
| download | chromium_src-5dc0cc7bf9cb2f5e6b050933d1ebe7852b10baa0.zip chromium_src-5dc0cc7bf9cb2f5e6b050933d1ebe7852b10baa0.tar.gz chromium_src-5dc0cc7bf9cb2f5e6b050933d1ebe7852b10baa0.tar.bz2 | |
Reverting 15832 since this test is finished.
BUG=11046 "Need to back out hbono's test fix"
Review URL: http://codereview.chromium.org/112021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/table/table_view.cc | 2 | ||||
| -rw-r--r-- | views/controls/tree/tree_view.cc | 2 | ||||
| -rw-r--r-- | views/widget/widget_win.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index 5ab86d3..10c0456 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -892,7 +892,7 @@ HWND TableView::CreateNativeControl(HWND parent_container) { // Bug 964884: detach the IME attached to this window. // We should attach IMEs only when we need to input CJK strings. - win_util::IMEAttach(list_view_, false); + ::ImmAssociateContextEx(list_view_, NULL, 0); UpdateContentOffset(); diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 894aa6e..08f2255 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -358,7 +358,7 @@ HWND TreeView::CreateNativeControl(HWND parent_container) { // Bug 964884: detach the IME attached to this window. // We should attach IMEs only when we need to input CJK strings. - win_util::IMEAttach(tree_view_, false); + ::ImmAssociateContextEx(tree_view_, NULL, 0); return tree_view_; } diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 759bcc9..5da1b63 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -219,7 +219,7 @@ void WidgetWin::Init(HWND parent, const gfx::Rect& bounds, // Bug 964884: detach the IME attached to this window. // We should attach IMEs only when we need to input CJK strings. - win_util::IMEAttach(GetNativeView(), false); + ::ImmAssociateContextEx(GetNativeView(), NULL, 0); } void WidgetWin::SetContentsView(View* view) { |