diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 23:03:10 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 23:03:10 +0000 |
| commit | 15a1b4eb437e4ea28327e1465b5ad3aaf7c90f84 (patch) | |
| tree | 0072d56df75762a9986ad14ec65193c0bc19f7f9 /ash | |
| parent | ae82cea5345e7d4bbeb56df21e8e3084c3080069 (diff) | |
| download | chromium_src-15a1b4eb437e4ea28327e1465b5ad3aaf7c90f84.zip chromium_src-15a1b4eb437e4ea28327e1465b5ad3aaf7c90f84.tar.gz chromium_src-15a1b4eb437e4ea28327e1465b5ad3aaf7c90f84.tar.bz2 | |
Promote views::InputMethodWin to ui/base/ime and get working. Cleanup surrounding code. I'm not too happy with how I plumbed through some of the win specific events, but that can be dealt with separately.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11476003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index ffdcf99..5d8b830 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -474,7 +474,8 @@ void Shell::Init() { AddPreTargetHandler(overlay_filter_.get()); AddShellObserver(overlay_filter_.get()); - input_method_filter_.reset(new views::corewm::InputMethodEventFilter); + input_method_filter_.reset(new views::corewm::InputMethodEventFilter( + root_window->GetAcceleratedWidget())); AddPreTargetHandler(input_method_filter_.get()); #if !defined(OS_MACOSX) |