| Index: chrome/browser/chromeos/input_method/ibus_controller_impl.cc
|
| diff --git a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc
|
| index ce16cf4a3d2358b12f72492a4fedba992183b393..be33f31b4de1b762d233b44d86a0e8aec9a43c96 100644
|
| --- a/chrome/browser/chromeos/input_method/ibus_controller_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/ibus_controller_impl.cc
|
| @@ -31,6 +31,7 @@
|
| #include "chromeos/dbus/ibus/ibus_input_context_client.h"
|
| #include "chromeos/dbus/ibus/ibus_panel_service.h"
|
| #include "chromeos/dbus/ibus/ibus_property.h"
|
| +#include "chromeos/ime/extension_ime_util.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/base/ime/input_method_ibus.h"
|
| @@ -200,7 +201,7 @@ bool IBusControllerImpl::ChangeInputMethod(const std::string& id) {
|
| // Sanity checks.
|
| DCHECK(!InputMethodUtil::IsKeyboardLayout(id));
|
| if (!whitelist_.InputMethodIdIsWhitelisted(id) &&
|
| - !InputMethodUtil::IsExtensionInputMethod(id))
|
| + !extension_ime_util::IsExtensionIME(id))
|
| return false;
|
|
|
| // Clear input method properties unconditionally if |id| is not equal to
|
|
|