| Index: chrome/browser/chromeos/input_method/input_method_util.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
|
| index e7faf456bc91412610c80db71f2651ae18229d1d..d3654fb9f71645ea27c49aa0ff328d6a6176f3e7 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_util.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_util.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/string_util.h"
|
| #include "base/strings/string_split.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "chromeos/ime/extension_ime_util.h"
|
| #include "chromeos/ime/input_method_delegate.h"
|
| #include "grit/generated_resources.h"
|
| #include "third_party/icu/public/common/unicode/uloc.h"
|
| @@ -367,15 +368,6 @@ bool InputMethodUtil::IsKeyboardLayout(const std::string& input_method_id) {
|
| return StartsWithASCII(input_method_id, "xkb:", kCaseInsensitive);
|
| }
|
|
|
| -// static
|
| -bool InputMethodUtil::IsExtensionInputMethod(
|
| - const std::string& input_method_id) {
|
| - const bool kCaseInsensitive = false;
|
| - return StartsWithASCII(input_method_id,
|
| - kExtensionImePrefix,
|
| - kCaseInsensitive);
|
| -}
|
| -
|
| std::string InputMethodUtil::GetLanguageCodeFromInputMethodId(
|
| const std::string& input_method_id) const {
|
| // The code should be compatible with one of codes used for UI languages,
|
| @@ -400,7 +392,7 @@ std::string InputMethodUtil::GetKeyboardLayoutName(
|
| std::string InputMethodUtil::GetInputMethodDisplayNameFromId(
|
| const std::string& input_method_id) const {
|
| string16 display_name;
|
| - if (!IsExtensionInputMethod(input_method_id) &&
|
| + if (!extension_ime_util::IsExtensionIME(input_method_id) &&
|
| TranslateStringInternal(input_method_id, &display_name)) {
|
| return UTF16ToUTF8(display_name);
|
| }
|
|
|