Rename ibus_input_methods.txt to input_methods.txt.

chrome/browser/chromeos/input_method/ibus_controller.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/ibus_controller.h"
 
 #if defined(HAVE_IBUS)
 #include <ibus.h>
 #endif
 
 #include <algorithm>  // for std::reverse.
 #include <cstdio>
 #include <cstring>  // for std::strcmp.
 #include <set>
 #include <sstream>
 #include <stack>
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/input_method/ibus_input_methods.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
+#include "chrome/browser/chromeos/input_method/input_methods.h"
 
 namespace chromeos {
 namespace input_method {
 
 #if defined(HAVE_IBUS)
 const char kPanelObjectKey[] = "panel-object";
 
 namespace {
 
 // Also defined in chrome/browser/chromeos/language_preferences.h (Chrome tree).
@@ skipping 763 matching lines @@
   }
 
   // Retrieves input method status and notifies them to the UI.
   // |current_global_engine_id| is the current global engine id such as "mozc"
   // and "xkb:us::eng". If the id is unknown, an empty string "" can be passed.
   // Warning: you can call this function only from ibus callback functions
   // like FocusIn(). See http://crosbug.com/5217#c9 for details.
   void UpdateUI(const char* current_global_engine_id) {
     DCHECK(current_global_engine_id);
 
-    const IBusEngineInfo* engine_info = NULL;
-    for (size_t i = 0; i < arraysize(kIBusEngines); ++i) {
-      if (kIBusEngines[i].input_method_id ==
+    const InputMethodsInfo* engine_info = NULL;
+    for (size_t i = 0; i < arraysize(kInputMethods); ++i) {
+      if (kInputMethods[i].input_method_id ==
           std::string(current_global_engine_id)) {
-        engine_info = &kIBusEngines[i];
+        engine_info = &kInputMethods[i];
         break;
       }
     }
 
     InputMethodDescriptor current_input_method;
     if (engine_info) {
       current_input_method = CreateInputMethodDescriptor(
           engine_info->input_method_id,
           "",
           engine_info->xkb_layout_id,
@@ skipping 332 matching lines @@
 #else
   return new IBusControllerStubImpl;
 #endif
 }
 
 IBusController::~IBusController() {
 }
 
 }  // namespace input_method
 }  // namespace chromeos