diff options
Diffstat (limited to 'chrome/browser')
6 files changed, 7 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index 234e2ff..c08fc82 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -394,7 +394,7 @@ void InputMethodManagerImpl::AddInputMethodExtension( // TODO(nona): Support options page for normal extension ime. // crbug.com/156283. extra_input_methods_[id] = - InputMethodDescriptor(id, name, layout, language, "", true); + InputMethodDescriptor(id, name, layout, language, ""); if (!Contains(filtered_extension_imes_, id) && !ComponentExtensionIMEManager::IsComponentExtensionIMEId(id)) { if (!Contains(active_input_method_ids_, id)) { diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 2eef818..8923235 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -624,8 +624,7 @@ InputMethodDescriptor InputMethodUtil::GetFallbackInputMethodDescriptor() { "", "us", "en-US", - "", // options page, not available. - false); + ""); // options page, not available. } void InputMethodUtil::ReloadInternalMaps() { diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index 6a1e521..915bc60 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -56,8 +56,7 @@ class InputMethodUtilTest : public testing::Test { "", raw_layout, language_code, - "", // options page url - false); + ""); // options page url } static string16 GetDisplayLanguageName(const std::string& language_code) { diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc index d0a6347..1751fd4 100644 --- a/chrome/browser/chromeos/input_method/mock_input_method_manager.cc +++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.cc @@ -118,8 +118,7 @@ InputMethodDescriptor MockInputMethodManager::GetCurrentInputMethod() const { descriptor.name(), descriptor.keyboard_layout(), descriptor.language_code(), - "", // options page url. - false); + ""); // options page url. } return descriptor; } diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index b869cb1..34b038d 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -90,6 +90,7 @@ #include "chromeos/dbus/power_manager_client.h" #include "chromeos/dbus/session_manager_client.h" #include "chromeos/dbus/system_clock_client.h" +#include "chromeos/ime/extension_ime_util.h" #include "chromeos/ime/xkeyboard.h" #include "chromeos/login/login_state.h" #include "content/public/browser/browser_thread.h" @@ -141,7 +142,7 @@ void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime, info->name = util.GetInputMethodLongName(ime); info->medium_name = util.GetInputMethodMediumName(ime); info->short_name = util.GetInputMethodShortName(ime); - info->third_party = ime.third_party(); + info->third_party = extension_ime_util::IsExtensionIME(ime.id()); } gfx::NativeWindow GetNativeWindowByStatus( diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc index 2b0864a..ac42c82 100644 --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler_unittest.cc @@ -47,8 +47,7 @@ class CrosLanguageOptionsHandlerTest : public testing::Test { "", // name raw_layout, language_code, - "", // options page url - false); + ""); // options page url } }; |