Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6827)

Unified Diff: chrome/browser/chromeos/input_method/ibus_controller.cc

Issue 9721017: Rename ibus_input_methods.txt to input_methods.txt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-retry Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/ibus_controller.cc
diff --git a/chrome/browser/chromeos/input_method/ibus_controller.cc b/chrome/browser/chromeos/input_method/ibus_controller.cc
index e71402595c5310d7f8fda50ea8607e982e9df0f0..11a064bc3a15683732e1c67c132f45a0b991f502 100644
--- a/chrome/browser/chromeos/input_method/ibus_controller.cc
+++ b/chrome/browser/chromeos/input_method/ibus_controller.cc
@@ -18,11 +18,11 @@
#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 {
@@ -806,11 +806,11 @@ class IBusControllerImpl : public IBusController {
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;
}
}
« no previous file with comments | « chrome/browser/chromeos/input_method/gen_input_methods.py ('k') | chrome/browser/chromeos/input_method/ibus_input_methods.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698