Chromium Code Reviews| Index: chrome/browser/chromeos/input_method/input_method_configuration.cc |
| diff --git a/chrome/browser/chromeos/input_method/input_method_configuration.cc b/chrome/browser/chromeos/input_method/input_method_configuration.cc |
| index f98025f15436453fc71d9bb46314909b364dc157..d38b211a8023d01fee5d88f3841eb646080ca7de 100644 |
| --- a/chrome/browser/chromeos/input_method/input_method_configuration.cc |
| +++ b/chrome/browser/chromeos/input_method/input_method_configuration.cc |
| @@ -5,12 +5,14 @@ |
| #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| #include "base/bind.h" |
| +#include "base/chromeos/chromeos_version.h" |
| #include "base/logging.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "chrome/browser/chromeos/input_method/browser_state_monitor.h" |
| #include "chrome/browser/chromeos/input_method/input_method_delegate_impl.h" |
| #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h" |
| #include "chrome/browser/chromeos/input_method/input_method_persistence.h" |
| +#include "chromeos/ime/ibus_bridge.h" |
| namespace chromeos { |
| namespace input_method { |
| @@ -31,6 +33,9 @@ void OnSessionStateChange(InputMethodManagerImpl* input_method_manager_impl, |
| void Initialize() { |
| DCHECK(!g_input_method_manager); |
| + if (!base::chromeos::IsRunningOnChromeOS()) |
|
satorux1
2013/02/07 01:46:16
Please add a comment why !IsRunningOnChromeOS()
Seigo Nonaka
2013/02/08 07:53:01
Done.
|
| + IBusBridge::Initialize(); |
| + |
| InputMethodManagerImpl* impl = new InputMethodManagerImpl( |
| scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl)); |
| impl->Init(); |
| @@ -59,6 +64,9 @@ void Shutdown() { |
| delete g_input_method_manager; |
| g_input_method_manager = NULL; |
| + if (!base::chromeos::IsRunningOnChromeOS()) |
|
satorux1
2013/02/07 01:46:16
This looks rather fragile.
Can you do something l
Seigo Nonaka
2013/02/08 07:53:01
Done.
|
| + IBusBridge::Shutdown(); |
| + |
| DVLOG(1) << "InputMethodManager shutdown"; |
| } |