| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/base/ime/input_method_factory.h" | 5 #include "ui/base/ime/input_method_factory.h" |
| 6 | 6 |
| 7 #include "ui/base/ime/mock_input_method.h" | 7 #include "ui/base/ime/mock_input_method.h" |
| 8 | 8 |
| 9 #if defined(OS_CHROMEOS) && defined(USE_X11) | 9 #if defined(OS_CHROMEOS) && defined(USE_X11) |
| 10 #include "ui/base/ime/input_method_chromeos.h" | 10 #include "ui/base/ime/input_method_chromeos.h" |
| 11 #elif defined(OS_WIN) | 11 #elif defined(OS_WIN) |
| 12 #include "base/win/metro.h" | 12 #include "base/win/metro.h" |
| 13 #include "ui/base/ime/input_method_imm32.h" | 13 #include "ui/base/ime/input_method_imm32.h" |
| 14 #include "ui/base/ime/input_method_tsf.h" | |
| 15 #include "ui/base/ime/remote_input_method_win.h" | 14 #include "ui/base/ime/remote_input_method_win.h" |
| 16 #elif defined(USE_AURA) && defined(OS_LINUX) | 15 #elif defined(USE_AURA) && defined(OS_LINUX) |
| 17 #include "ui/base/ime/input_method_auralinux.h" | 16 #include "ui/base/ime/input_method_auralinux.h" |
| 18 #else | 17 #else |
| 19 #include "ui/base/ime/input_method_minimal.h" | 18 #include "ui/base/ime/input_method_minimal.h" |
| 20 #endif | 19 #endif |
| 21 | 20 |
| 22 namespace { | 21 namespace { |
| 23 | 22 |
| 24 bool g_input_method_set_for_testing = false; | 23 bool g_input_method_set_for_testing = false; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 38 gfx::AcceleratedWidget widget) { | 37 gfx::AcceleratedWidget widget) { |
| 39 if (!g_create_input_method_called) | 38 if (!g_create_input_method_called) |
| 40 g_create_input_method_called = true; | 39 g_create_input_method_called = true; |
| 41 | 40 |
| 42 if (g_input_method_set_for_testing) | 41 if (g_input_method_set_for_testing) |
| 43 return scoped_ptr<InputMethod>(new MockInputMethod(delegate)); | 42 return scoped_ptr<InputMethod>(new MockInputMethod(delegate)); |
| 44 | 43 |
| 45 #if defined(OS_CHROMEOS) && defined(USE_X11) | 44 #if defined(OS_CHROMEOS) && defined(USE_X11) |
| 46 return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate)); | 45 return scoped_ptr<InputMethod>(new InputMethodChromeOS(delegate)); |
| 47 #elif defined(OS_WIN) | 46 #elif defined(OS_WIN) |
| 48 if (base::win::IsTSFAwareRequired()) | |
| 49 return scoped_ptr<InputMethod>(new InputMethodTSF(delegate, widget)); | |
| 50 if (IsRemoteInputMethodWinRequired(widget)) | 47 if (IsRemoteInputMethodWinRequired(widget)) |
| 51 return CreateRemoteInputMethodWin(delegate); | 48 return CreateRemoteInputMethodWin(delegate); |
| 52 return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget)); | 49 return scoped_ptr<InputMethod>(new InputMethodIMM32(delegate, widget)); |
| 53 #elif defined(USE_AURA) && defined(OS_LINUX) | 50 #elif defined(USE_AURA) && defined(OS_LINUX) |
| 54 return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate)); | 51 return scoped_ptr<InputMethod>(new InputMethodAuraLinux(delegate)); |
| 55 #else | 52 #else |
| 56 return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate)); | 53 return scoped_ptr<InputMethod>(new InputMethodMinimal(delegate)); |
| 57 #endif | 54 #endif |
| 58 } | 55 } |
| 59 | 56 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 80 | 77 |
| 81 void DestroySharedInputMethod() { | 78 void DestroySharedInputMethod() { |
| 82 delete g_shared_input_method; | 79 delete g_shared_input_method; |
| 83 g_shared_input_method = NULL; | 80 g_shared_input_method = NULL; |
| 84 } | 81 } |
| 85 | 82 |
| 86 } // namespace internal | 83 } // namespace internal |
| 87 #endif | 84 #endif |
| 88 | 85 |
| 89 } // namespace ui | 86 } // namespace ui |
| OLD | NEW |