Commit b2e08e86 authored by Darren Shen's avatar Darren Shen Committed by Commit Bot

ime: Remove ImeInfo.medium_name.

It is never used.

Change-Id: Ida1aab177d931ce174c0278aefc8b5a02a761132
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2539216Reviewed-by: default avatarDarren Shen <shend@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827970}
parent 95e37a64
...@@ -27,9 +27,6 @@ struct ASH_PUBLIC_EXPORT ImeInfo { ...@@ -27,9 +27,6 @@ struct ASH_PUBLIC_EXPORT ImeInfo {
// Long name of the IME, which is used as the user-visible name. // Long name of the IME, which is used as the user-visible name.
base::string16 name; base::string16 name;
// Medium name of the IME, which is the same as the short name in most cases.
base::string16 medium_name;
// UI indicator for the IME (e.g., "US"). If the IME has no indicator, uses // UI indicator for the IME (e.g., "US"). If the IME has no indicator, uses
// the first two characters in its preferred keyboard layout or language code // the first two characters in its preferred keyboard layout or language code
// (e.g., "ko", "ja", "en-US"). // (e.g., "ko", "ja", "en-US").
......
...@@ -135,14 +135,12 @@ TEST_F(ImeMenuTrayTest, TrayLabelTest) { ...@@ -135,14 +135,12 @@ TEST_F(ImeMenuTrayTest, TrayLabelTest) {
ImeInfo info1; ImeInfo info1;
info1.id = "ime1"; info1.id = "ime1";
info1.name = UTF8ToUTF16("English"); info1.name = UTF8ToUTF16("English");
info1.medium_name = UTF8ToUTF16("English");
info1.short_name = UTF8ToUTF16("US"); info1.short_name = UTF8ToUTF16("US");
info1.third_party = false; info1.third_party = false;
ImeInfo info2; ImeInfo info2;
info2.id = "ime2"; info2.id = "ime2";
info2.name = UTF8ToUTF16("English UK"); info2.name = UTF8ToUTF16("English UK");
info2.medium_name = UTF8ToUTF16("English UK");
info2.short_name = UTF8ToUTF16("UK"); info2.short_name = UTF8ToUTF16("UK");
info2.third_party = true; info2.third_party = true;
...@@ -205,19 +203,16 @@ TEST_F(ImeMenuTrayTest, RefreshImeWithListViewCreated) { ...@@ -205,19 +203,16 @@ TEST_F(ImeMenuTrayTest, RefreshImeWithListViewCreated) {
ImeInfo info1, info2, info3; ImeInfo info1, info2, info3;
info1.id = "ime1"; info1.id = "ime1";
info1.name = UTF8ToUTF16("English"); info1.name = UTF8ToUTF16("English");
info1.medium_name = UTF8ToUTF16("English");
info1.short_name = UTF8ToUTF16("US"); info1.short_name = UTF8ToUTF16("US");
info1.third_party = false; info1.third_party = false;
info2.id = "ime2"; info2.id = "ime2";
info2.name = UTF8ToUTF16("English UK"); info2.name = UTF8ToUTF16("English UK");
info2.medium_name = UTF8ToUTF16("English UK");
info2.short_name = UTF8ToUTF16("UK"); info2.short_name = UTF8ToUTF16("UK");
info2.third_party = true; info2.third_party = true;
info3.id = "ime3"; info3.id = "ime3";
info3.name = UTF8ToUTF16("Pinyin"); info3.name = UTF8ToUTF16("Pinyin");
info3.medium_name = UTF8ToUTF16("Chinese Pinyin");
info3.short_name = UTF8ToUTF16("拼"); info3.short_name = UTF8ToUTF16("拼");
info3.third_party = false; info3.third_party = false;
......
...@@ -209,7 +209,6 @@ ash::ImeInfo ImeControllerClient::GetAshImeInfo( ...@@ -209,7 +209,6 @@ ash::ImeInfo ImeControllerClient::GetAshImeInfo(
ash::ImeInfo info; ash::ImeInfo info;
info.id = ime.id(); info.id = ime.id();
info.name = util->GetInputMethodLongName(ime); info.name = util->GetInputMethodLongName(ime);
info.medium_name = util->GetInputMethodMediumName(ime);
info.short_name = util->GetInputMethodShortName(ime); info.short_name = util->GetInputMethodShortName(ime);
info.third_party = chromeos::extension_ime_util::IsExtensionIME(ime.id()); info.third_party = chromeos::extension_ime_util::IsExtensionIME(ime.id());
return info; return info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment