| Index: chrome/browser/chromeos/extensions/input_method_event_router.cc
|
| diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc
|
| index 7be5ce1b0b6e97b91758999a0444c5e2e21b423b..57164c38fb5868c35ec1871760716e795be43912 100644
|
| --- a/chrome/browser/chromeos/extensions/input_method_event_router.cc
|
| +++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc
|
| @@ -32,9 +32,7 @@ ExtensionInputMethodEventRouter::~ExtensionInputMethodEventRouter() {
|
| }
|
|
|
| void ExtensionInputMethodEventRouter::InputMethodChanged(
|
| - input_method::InputMethodManager *manager,
|
| - const input_method::InputMethodDescriptor ¤t_input_method,
|
| - size_t num_active_input_methods) {
|
| + input_method::InputMethodManager *manager) {
|
| Profile *profile = ProfileManager::GetDefaultProfile();
|
| ExtensionEventRouter *router = profile->GetExtensionEventRouter();
|
|
|
| @@ -42,8 +40,8 @@ void ExtensionInputMethodEventRouter::InputMethodChanged(
|
| return;
|
|
|
| ListValue args;
|
| - StringValue *input_method_name =
|
| - new StringValue(GetInputMethodForXkb(current_input_method.id()));
|
| + StringValue *input_method_name = new StringValue(
|
| + GetInputMethodForXkb(manager->GetCurrentInputMethod().id()));
|
| args.Append(input_method_name);
|
| std::string args_json;
|
| base::JSONWriter::Write(&args, &args_json);
|
| @@ -54,17 +52,6 @@ void ExtensionInputMethodEventRouter::InputMethodChanged(
|
| args_json, profile, GURL());
|
| }
|
|
|
| -void ExtensionInputMethodEventRouter::ActiveInputMethodsChanged(
|
| - input_method::InputMethodManager *manager,
|
| - const input_method::InputMethodDescriptor ¤t_input_method,
|
| - size_t num_active_input_methods) {
|
| -}
|
| -
|
| -void ExtensionInputMethodEventRouter::PropertyListChanged(
|
| - input_method::InputMethodManager *manager,
|
| - const input_method::InputMethodPropertyList ¤t_ime_properties) {
|
| -}
|
| -
|
| std::string ExtensionInputMethodEventRouter::GetInputMethodForXkb(
|
| const std::string& xkb_id) {
|
| size_t prefix_length = std::string(kXkbPrefix).length();
|
|
|