Remove rerely used configuration items for the Japanese IME to simplify the dialog.

BUG=chromium-os:19870
TEST=try


Review URL: http://codereview.chromium.org/7811017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98971 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 1 insertions, 95 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b136689..48c9ceb 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11970,22 +11970,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
                desc="The checkbox label for a Mozc input method preference">
         Automatically switch to halfwidth
       </message>
-      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_DATE_CONVERSION"
-               desc="The checkbox label for a Mozc input method preference">
-        Date/time conversion
-      </message>
-      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_SINGLE_KANJI_CONVERSION"
-               desc="The checkbox label for a Mozc input method preference">
-        Single kanji dictionary
-      </message>
-      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_SYMBOL_CONVERSION"
-               desc="The checkbox label for a Mozc input method preference">
-        Symbol dictionary
-      </message>
-      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_NUMBER_CONVERSION"
-               desc="The checkbox label for a Mozc input method preference">
-        Special number conversion
-      </message>
       <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_HISTORY_SUGGEST"
                desc="The checkbox label for a Mozc input method preference">
         Use input history
diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc
index e0eed23..a79d1b4 100644
--- a/chrome/browser/chromeos/language_preferences.cc
+++ b/chrome/browser/chromeos/language_preferences.cc
@@ -254,26 +254,6 @@ const LanguageBooleanPrefs kMozcBooleanPrefs[] = {
     "use_auto_ime_turn_off",
     IDS_MOZC(USE_AUTO_IME_TURN_OFF),
     PrefService::SYNCABLE_PREF },
-  { prefs::kLanguageMozcUseDateConversion,
-    true,
-    "use_date_conversion",
-    IDS_MOZC(USE_DATE_CONVERSION),
-    PrefService::SYNCABLE_PREF },
-  { prefs::kLanguageMozcUseSingleKanjiConversion,
-    true,
-    "use_single_kanji_conversion",
-    IDS_MOZC(USE_SINGLE_KANJI_CONVERSION),
-    PrefService::SYNCABLE_PREF },
-  { prefs::kLanguageMozcUseSymbolConversion,
-    true,
-    "use_symbol_conversion",
-    IDS_MOZC(USE_SYMBOL_CONVERSION),
-    PrefService::SYNCABLE_PREF },
-  { prefs::kLanguageMozcUseNumberConversion,
-    true,
-    "use_number_conversion",
-    IDS_MOZC(USE_NUMBER_CONVERSION),
-    PrefService::SYNCABLE_PREF },
   { prefs::kLanguageMozcUseHistorySuggest,
     true,
     "use_history_suggest",
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 51d60ce..81adc9f 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -135,7 +135,7 @@ extern const char kMozcSectionName[];
 
 extern const LanguageBooleanPrefs kMozcBooleanPrefs[];
 // See comments at kNumChewingBooleanPrefs for why we hard-code this here.
-const size_t kNumMozcBooleanPrefs = 8;
+const size_t kNumMozcBooleanPrefs = 4;
 
 extern const LanguageMultipleChoicePreference<const char*>
     kMozcMultipleChoicePrefs[];
diff --git a/chrome/browser/resources/options/chromeos/language_mozc_options.html b/chrome/browser/resources/options/chromeos/language_mozc_options.html
index a84ef0b..6991261 100644
--- a/chrome/browser/resources/options/chromeos/language_mozc_options.html
+++ b/chrome/browser/resources/options/chromeos/language_mozc_options.html
@@ -30,52 +30,6 @@
         <td class="option-name" colspan="2">
           <div class="checkbox">
             <label>
-              <input id="mozc-use-date-conversion"
-                  pref="settings.language.mozc_use_date_conversion"
-                  type="checkbox">
-              <span i18n-content="mozc_use_date_conversion"></span>
-            </label>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td class="option-name" colspan="2">
-          <div class="checkbox">
-            <label>
-              <input id="mozc-use-single-kanji-conversion"
-                  pref="settings.language.mozc_use_single_kanji_conversion"
-                  type="checkbox">
-              <span i18n-content="mozc_use_single_kanji_conversion"></span>
-            </label>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td class="option-name" colspan="2">
-          <div class="checkbox">
-            <label>
-              <input id="mozc-use-symbol-conversion" type="checkbox"
-                  pref="settings.language.mozc_use_symbol_conversion">
-              <span i18n-content="mozc_use_symbol_conversion"></span>
-            </label>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td class="option-name" colspan="2">
-          <div class="checkbox">
-            <label>
-              <input id="mozc-use-number-conversion" type="checkbox"
-                  pref="settings.language.mozc_use_number_conversion">
-              <span i18n-content="mozc_use_number_conversion"></span>
-            </label>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td class="option-name" colspan="2">
-          <div class="checkbox">
-            <label>
               <input id="mozc-use-history-suggest" type="checkbox"
                   pref="settings.language.mozc_use_history_suggest">
               <span i18n-content="mozc_use_history_suggest"></span>
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 6e766d3..75bd8e9 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -502,14 +502,6 @@ const char kLanguageMozcIncognitoMode[] =
     "settings.language.mozc_incognito_mode";
 const char kLanguageMozcUseAutoImeTurnOff[] =
     "settings.language.mozc_use_auto_ime_turn_off";
-const char kLanguageMozcUseDateConversion[] =
-    "settings.language.mozc_use_date_conversion";
-const char kLanguageMozcUseSingleKanjiConversion[] =
-    "settings.language.mozc_use_single_kanji_conversion";
-const char kLanguageMozcUseSymbolConversion[] =
-    "settings.language.mozc_use_symbol_conversion";
-const char kLanguageMozcUseNumberConversion[] =
-    "settings.language.mozc_use_number_conversion";
 const char kLanguageMozcUseHistorySuggest[] =
     "settings.language.mozc_use_history_suggest";
 const char kLanguageMozcUseDictionarySuggest[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 0c302fc..2469dae 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -188,10 +188,6 @@ extern const char kLanguageMozcShiftKeyModeSwitch[];
 extern const char kLanguageMozcNumpadCharacterForm[];
 extern const char kLanguageMozcIncognitoMode[];
 extern const char kLanguageMozcUseAutoImeTurnOff[];
-extern const char kLanguageMozcUseDateConversion[];
-extern const char kLanguageMozcUseSingleKanjiConversion[];
-extern const char kLanguageMozcUseSymbolConversion[];
-extern const char kLanguageMozcUseNumberConversion[];
 extern const char kLanguageMozcUseHistorySuggest[];
 extern const char kLanguageMozcUseDictionarySuggest[];
 extern const char kLanguageMozcSuggestionsSize[];