Add very minimum IBus-1.5 support to InputMethodManager

chrome/browser/chromeos/input_method/input_method_manager.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.h"
 
 #include <algorithm>
 
 #include <glib.h>
 
@@ skipping 18 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "unicode/uloc.h"
 
 #if !defined(USE_VIRTUAL_KEYBOARD)
 #include "chrome/browser/chromeos/input_method/candidate_window.h"
 #endif
 
+#if defined(HAVE_IBUS)
+#include <ibus.h>
+#endif
+
 using content::BrowserThread;
 
 namespace {
 
 const char kIBusDaemonPath[] = "/usr/bin/ibus-daemon";
 
 // Finds a property which has |new_prop.key| from |prop_list|, and replaces the
 // property with |new_prop|. Returns true if such a property is found.
 bool FindAndUpdateProperty(
     const chromeos::input_method::InputMethodProperty& new_prop,
@@ skipping 716 matching lines @@
             tentative_current_input_method_id_);
         if (engine_iter != value.string_list_value.end()) {
           // Use std::rotate to keep the relative order of engines the same e.g.
           // from "A,B,C" to "C,A,B".
           // We don't have to |active_input_method_ids_|, which decides the
           // order of engines in the switcher menu, since the relative order
           // of |value.string_list_value| is not changed.
           std::rotate(value.string_list_value.begin(),
                       engine_iter,  // this becomes the new first element
                       value.string_list_value.end());
+#if defined(HAVE_IBUS)
+#if IBUS_CHECK_VERSION(1, 4, 99)
+          ibus_controller_->ChangeInputMethod(*engine_iter);

[kinaba, 2012/04/13 06:16:50]

You mean value.string_list_value[0]? The vector is already rotated here.

[Yusuke Sato, 2012/04/13 09:07:16]

Done.

+#endif
+#endif
         } else {
           LOG(WARNING) << tentative_current_input_method_id_
                        << " is not in preload_engines: " << value.ToString();
         }
         tentative_current_input_method_id_.erase();
       }
 
       if (ibus_controller_->SetInputMethodConfig(section, config_name, value)) {
         // Check if it's a change in active input methods.
         if (config_name == language_prefs::kPreloadEnginesConfigName) {
@@ skipping 478 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 // static
 InputMethodManager* InputMethodManager::GetInstance() {
   return InputMethodManagerImpl::GetInstance();
 }
 
 }  // namespace input_method
 }  // namespace chromeos