diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 22:06:41 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-04 22:06:41 +0000 |
| commit | 6274d31a70163460b5b9d078f49f7330ff0ce5ea (patch) | |
| tree | efb570df860f7294d8c5b0be31918a4a26413c39 /ash/root_window_controller.cc | |
| parent | c105f9453ac911895336395ac80de9f36a5ec692 (diff) | |
| download | chromium_src-6274d31a70163460b5b9d078f49f7330ff0ce5ea.zip chromium_src-6274d31a70163460b5b9d078f49f7330ff0ce5ea.tar.gz chromium_src-6274d31a70163460b5b9d078f49f7330ff0ce5ea.tar.bz2 | |
Fix IME related window crashes.
Should reparent all IME related window in InputMethodContainer.
BUG=153330,153983
TEST=Manually checked with lumpy
Review URL: https://chromiumcodereview.appspot.com/11066011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 532d60a..d907eae 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -95,6 +95,7 @@ void ReparentAllWindows(aura::RootWindow* src, aura::RootWindow* dst) { internal::kShellWindowId_AlwaysOnTopContainer, internal::kShellWindowId_SystemModalContainer, internal::kShellWindowId_LockSystemModalContainer, + internal::kShellWindowId_InputMethodContainer, }; // For Workspace2 we need to manually reparent the windows. This way // Workspace2 can move the windows to the appropriate workspace. |