Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / input_method / input_method_configuration.cc

diff --git a/src/chrome/browser/chromeos/input_method/input_method_configuration.cc b/src/chrome/browser/chromeos/input_method/input_method_configuration.cc
index a7b3661..6c5d5bf 100644 (file)
--- a/src/chrome/browser/chromeos/input_method/input_method_configuration.cc
+++ b/src/chrome/browser/chromeos/input_method/input_method_configuration.cc
@@ -25,18 +25,19 @@ void OnSessionStateChange(InputMethodManagerImpl* input_method_manager_impl,
   input_method_manager_impl->SetState(new_state);
 }
 
+bool g_disable_extension_loading = false;
+
 class InputMethodConfiguration {
  public:
   InputMethodConfiguration() {}
   virtual ~InputMethodConfiguration() {}
 
-  void Initialize(
-      const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner) {
+  void Initialize() {
     IMEBridge::Initialize();
 
     InputMethodManagerImpl* impl = new InputMethodManagerImpl(
-        scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl));
-    impl->Init(ui_task_runner.get());
+        scoped_ptr<InputMethodDelegate>(new InputMethodDelegateImpl),
+        !g_disable_extension_loading);
     InputMethodManager::Initialize(impl);
 
     DCHECK(InputMethodManager::Get());
@@ -78,12 +79,10 @@ InputMethodConfiguration* g_input_method_configuration = NULL;
 
 }  // namespace
 
-void Initialize(
-    const scoped_refptr<base::SequencedTaskRunner>& ui_task_runner,
-    const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) {
+void Initialize() {
   if (!g_input_method_configuration)
     g_input_method_configuration = new InputMethodConfiguration();
-  g_input_method_configuration->Initialize(ui_task_runner);
+  g_input_method_configuration->Initialize();
 }
 
 void InitializeForTesting(InputMethodManager* mock_manager) {
@@ -92,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;