| 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 26c67254c36d53aa298d430b89e973aae745bb98..6c5d5bf5a49fe29b422db3edc130961bcef10050 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_configuration.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_configuration.cc
|
| @@ -25,6 +25,8 @@ void OnSessionStateChange(InputMethodManagerImpl* input_method_manager_impl,
|
| input_method_manager_impl->SetState(new_state);
|
| }
|
|
|
| +bool g_disable_extension_loading = false;
|
| +
|
| class InputMethodConfiguration {
|
| public:
|
| InputMethodConfiguration() {}
|
| @@ -34,7 +36,8 @@ class InputMethodConfiguration {
|
| IMEBridge::Initialize();
|
|
|
| InputMethodManagerImpl* impl = new InputMethodManagerImpl(
|
| - scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl));
|
| + scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl),
|
| + !g_disable_extension_loading);
|
| InputMethodManager::Initialize(impl);
|
|
|
| DCHECK(InputMethodManager::Get());
|
| @@ -88,6 +91,10 @@ void InitializeForTesting(InputMethodManager* mock_manager) {
|
| g_input_method_configuration->InitializeForTesting(mock_manager);
|
| }
|
|
|
| +void DisableExtensionLoading() {
|
| + g_disable_extension_loading = true;
|
| +}
|
| +
|
| void Shutdown() {
|
| if (!g_input_method_configuration)
|
| return;
|
|
|