Move SetCursorLocation bypass code.

chrome/browser/chromeos/input_method/input_method_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_delegate.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
 
 bool Contains(const std::vector<std::string>& container,
               const std::string& value) {
@@ skipping 216 matching lines @@
     scoped_ptr<InputMethodDescriptors> input_methods(GetActiveInputMethods());
     DCHECK(!input_methods->empty());
     input_method_id_to_switch = input_methods->at(0).id();
     if (!input_method_id.empty()) {
       DVLOG(1) << "Can't change the current input method to "
                << input_method_id << " since the engine is not enabled. "
                << "Switch to " << input_method_id_to_switch << " instead.";
     }
   }
 
+  IBusInputContextClient* input_context =
+      chromeos::DBusThreadManager::Get()->GetIBusInputContextClient();
   if (InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch)) {
     FOR_EACH_OBSERVER(InputMethodManager::Observer,
                       observers_,
                       InputMethodPropertyChanged(this));
     // Hack for fixing http://crosbug.com/p/12798
     // We should notify IME switching to ibus-daemon, otherwise
     // IBusPreeditFocusMode does not work. To achieve it, change engine to
     // itself if the next engine is XKB layout.
     const std::string current_input_method_id = current_input_method_.id();
     if (current_input_method_id.empty() ||
         InputMethodUtil::IsKeyboardLayout(current_input_method_id)) {
       ibus_controller_->Reset();
     } else {
       ibus_controller_->ChangeInputMethod(current_input_method_id);
     }
+    if (input_context)
+      input_context->SetIsXKBLayout(true);
   } else {
     ibus_controller_->ChangeInputMethod(input_method_id_to_switch);
+    if (input_context)
+      input_context->SetIsXKBLayout(false);
   }
 
   if (current_input_method_.id() != input_method_id_to_switch) {
     const InputMethodDescriptor* descriptor = NULL;
     if (!InputMethodUtil::IsExtensionInputMethod(input_method_id_to_switch)) {
       descriptor =
           util_.GetInputMethodDescriptorFromId(input_method_id_to_switch);
     } else {
       std::map<std::string, InputMethodDescriptor>::const_iterator i =
           extra_input_methods_.find(input_method_id_to_switch);
@@ skipping 276 matching lines @@
 }
 
 void InputMethodManagerImpl::OnConnected() {
   for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
           extra_input_method_instances_.begin();
        ite != extra_input_method_instances_.end();
        ite++) {
     if (!Contains(filtered_extension_imes_, ite->first))
       ite->second->OnConnected();
   }
+
+  const bool is_xkb_layout =
+      InputMethodUtil::IsKeyboardLayout(current_input_method_.id());
+  IBusInputContextClient* input_context =
+      chromeos::DBusThreadManager::Get()->GetIBusInputContextClient();
+  DCHECK(input_context);
+  input_context->SetIsXKBLayout(is_xkb_layout);
 }
 
 void InputMethodManagerImpl::OnDisconnected() {
   for (std::map<std::string, InputMethodEngineIBus*>::iterator ite =
           extra_input_method_instances_.begin();
        ite != extra_input_method_instances_.end();
        ite++) {
     if (!Contains(filtered_extension_imes_, ite->first))
       ite->second->OnDisconnected();
   }
@@ skipping 99 matching lines @@
   candidate_window_controller_.reset(
       CandidateWindowController::CreateCandidateWindowController());
   if (candidate_window_controller_->Init(ibus_controller_.get()))
     candidate_window_controller_->AddObserver(this);
   else
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 }  // namespace input_method
 }  // namespace chromeos