Break cyclic dependency between c/b/chromeos and c/b/chromeos/input_method...

Break cyclic dependency between c/b/chromeos and c/b/chromeos/input_method...

...by extracting input_method_constants from language_preferences.

TBR=zelidrag,jochen
BUG=164375
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=174829

[erikwright (departed), 2012-12-13 19:48:01]

nona: PTAL.

I have not re-wrapped lines in this patchset - I thought it would be easier to
review this way. I'll rewrap after you check the non-whitespace changes (unless
you prefer otherwise).

After this I'll be able to submit a CL that moves input_method to top-level
chromeos.

[erikwright (departed), 2012-12-14 14:14:35]

nona: PTAL.

I have not re-wrapped lines in this patchset - I thought it would be easier to
review this way. I'll rewrap after you check the non-whitespace changes (unless
you prefer otherwise).

After this I'll be able to submit a CL that moves input_method to top-level
chromeos.

[Seigo Nonaka, 2012-12-17 12:29:45]

Mostly style nits:

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
File chrome/browser/chromeos/input_method/input_method_constants.h (right):

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:8: //
TODO(yusukes): Rename this file to input_method_preference.cc. Since
nit: please remove this todo comment.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:79: // We have to
sync the |keyboard_id|s with those in libhangul.
nit: please fix indent.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:85: // We don't
support "Sebeolsik 2 set" keyboard.
ditto.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:105: //
TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32
ditto.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
File chrome/browser/chromeos/language_preferences.cc (right):

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/language_preferences.cc:21: {
prefs::kLanguageChewingAutoShiftCur, false, input_method::kChewingAutoShiftCur,
<=80 characters.

[erikwright (departed), 2012-12-17 15:10:12]

PTAL.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
File chrome/browser/chromeos/input_method/input_method_constants.h (right):

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:8: //
TODO(yusukes): Rename this file to input_method_preference.cc. Since
On 2012/12/17 12:29:45, Seigo Nonaka wrote:
> nit: please remove this todo comment.

Done.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:79: // We have to
sync the |keyboard_id|s with those in libhangul.
On 2012/12/17 12:29:45, Seigo Nonaka wrote:
> nit: please fix indent.

Done.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:85: // We don't
support "Sebeolsik 2 set" keyboard.
On 2012/12/17 12:29:45, Seigo Nonaka wrote:
> ditto.

Done.

https://chromiumcodereview.appspot.com/11573014/diff/3001/chrome/browser/chro...
chrome/browser/chromeos/input_method/input_method_constants.h:105: //
TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32
On 2012/12/17 12:29:45, Seigo Nonaka wrote:
> ditto.

Done.

[Seigo Nonaka, 2012-12-17 16:32:57]

lgtm

[erikwright (departed), 2012-12-21 21:27:19]

zork: PTAL for c/b/chromeos/ OWNERS.

[Zachary Kuznia, 2012-12-26 01:04:23]

lgtm

[erikwright (departed), 2012-12-26 02:29:38]

TBR jochen@ for chrome/chrome_browser_chromeos.gypi

[commit-bot: I haz the power, 2012-12-26 02:29:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11573014/18001

[commit-bot: I haz the power, 2012-12-26 02:29:56]

Failed to apply patch for chrome/browser/chromeos/language_preferences.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/language_preferences.cc
  Hunk #2 FAILED at 12.
  Hunk #3 succeeded at 36 with fuzz 2.
  Hunk #4 FAILED at 45.
  Hunk #5 FAILED at 60.
  Hunk #6 FAILED at 75.
  Hunk #7 succeeded at 123 with fuzz 2.
  Hunk #10 FAILED at 164.
  Hunk #11 FAILED at 211.
  Hunk #12 FAILED at 233.
  Hunk #13 FAILED at 263.
  Hunk #14 FAILED at 335.
  Hunk #15 succeeded at 382 with fuzz 2 (offset 4 lines).
  9 out of 15 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/language_preferences.cc.rej

Patch:       chrome/browser/chromeos/language_preferences.cc
Index: chrome/browser/chromeos/language_preferences.cc
diff --git a/chrome/browser/chromeos/language_preferences.cc
b/chrome/browser/chromeos/language_preferences.cc
index
f2adbaac76b5c5784d22c009644ef12817203842..68f3112e83244c557a6a37c3ef83195994a4a4fb
100644
--- a/chrome/browser/chromeos/language_preferences.cc
+++ b/chrome/browser/chromeos/language_preferences.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
+#include "chrome/browser/chromeos/input_method/input_method_constants.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
@@ -11,23 +12,18 @@ namespace chromeos {
 namespace language_prefs {
 
 // ---------------------------------------------------------------------------
-// For ibus-daemon
-// ---------------------------------------------------------------------------
-const char kGeneralSectionName[] = "general";
-const char kPreloadEnginesConfigName[] = "preload_engines";
-
-// ---------------------------------------------------------------------------
 // For Traditional Chinese input method (ibus-mozc-chewing)
 // ---------------------------------------------------------------------------
-const char kChewingSectionName[] = "engine/Chewing";
 
 // We have to sync the |ibus_config_name|s with those in
 // ibus-chewing/files/src/Config.cc.
 const LanguageBooleanPrefs kChewingBooleanPrefs[] = {
-  { prefs::kLanguageChewingAutoShiftCur, false, "autoShiftCur",
+  { prefs::kLanguageChewingAutoShiftCur, false,
+    input_method::kChewingAutoShiftCur,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR,
     PrefService::SYNCABLE_PREF },
-  { prefs::kLanguageChewingAddPhraseDirection, false, "addPhraseDirection",
+  { prefs::kLanguageChewingAddPhraseDirection, false,
+    input_method::kChewingAddPhraseDirection,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIRECTION,
     PrefService::SYNCABLE_PREF },
   /* Temporarily disabled. (crosbug.com/14185)
@@ -35,7 +31,8 @@ const LanguageBooleanPrefs kChewingBooleanPrefs[] = {
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_EASY_SYMBOL_INPUT,
     PrefService::SYNCABLE_PREF },
   */
-  { prefs::kLanguageChewingEscCleanAllBuf, false, "escCleanAllBuf",
+  { prefs::kLanguageChewingEscCleanAllBuf, false,
+    input_method::kChewingEscCleanAllBuf,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ESC_CLEAN_ALL_BUF,
     PrefService::SYNCABLE_PREF },
   { prefs::kLanguageChewingForceLowercaseEnglish, false,
@@ -43,14 +40,17 @@ const LanguageBooleanPrefs kChewingBooleanPrefs[] = {
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_FORCE_LOWER_CASE_ENGLISH,
     PrefService::SYNCABLE_PREF },
   /* Temporarily disabled. (crosbug.com/14185)
-  { prefs::kLanguageChewingPlainZhuyin, false, "plainZhuyin",
+  { prefs::kLanguageChewingPlainZhuyin, false,
+    input_method::kChewingPlainZhuyin,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PLAIN_ZHUYIN,
     PrefService::SYNCABLE_PREF },
   */
-  { prefs::kLanguageChewingPhraseChoiceRearward, true, "phraseChoiceRearward",
+  { prefs::kLanguageChewingPhraseChoiceRearward, true,
+    input_method::kChewingPhraseChoiceRearward,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PHRASE_CHOICE_REARWARD,
     PrefService::SYNCABLE_PREF },
-  { prefs::kLanguageChewingSpaceAsSelection, true, "spaceAsSelection",
+  { prefs::kLanguageChewingSpaceAsSelection, true,
+    input_method::kChewingSpaceAsSelection,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_SPACE_AS_SELECTION,
     PrefService::SYNCABLE_PREF },
 };
@@ -58,11 +58,13 @@ COMPILE_ASSERT(kNumChewingBooleanPrefs ==
arraysize(kChewingBooleanPrefs),
                TheSizeShouldMatch);
 
 const LanguageIntegerRangePreference kChewingIntegerPrefs[] = {
-  { prefs::kLanguageChewingMaxChiSymbolLen, 20, 8, 40, "maxChiSymbolLen",
+  { prefs::kLanguageChewingMaxChiSymbolLen, 20, 8, 40,
+    input_method::kChewingMaxChiSymbolLen,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_MAX_CHI_SYMBOL_LEN,
     PrefService::SYNCABLE_PREF
   },
-  { prefs::kLanguageChewingCandPerPage, 10, 8, 10, "candPerPage",
+  { prefs::kLanguageChewingCandPerPage, 10, 8, 10,
+    input_method::kChewingCandPerPage,
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_CAND_PER_PAGE,
     PrefService::SYNCABLE_PREF
   },
@@ -73,43 +75,49 @@ COMPILE_ASSERT(kNumChewingIntegerPrefs ==
arraysize(kChewingIntegerPrefs),
 const LanguageMultipleChoicePreference<const char*>
     kChewingMultipleChoicePrefs[] = {
   { prefs::kLanguageChewingKeyboardType,
-    "default",
-    "KBType",
-    {{ "default",
+    input_method::kChewingKeyboardTypeDefault,
+    input_method::kChewingKeyboardType,
+    {{ input_method::kChewingKeyboardTypeDefault,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DEFAULT },
-     { "hsu", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HSU },
-     { "ibm", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_IBM },
-     { "gin_yieh",
+     { input_method::kChewingKeyboardTypeHsu,
+       IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HSU },
+     { input_method::kChewingKeyboardTypeIbm,
+       IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_IBM },
+     { input_method::kChewingKeyboardTypeGinYieh,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_GIN_YIEH },
-     { "eten", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN },
-     { "eten26", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN26 },
-     { "dvorak", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DVORAK },
-     { "dvorak_hsu",
+     { input_method::kChewingKeyboardTypeEten,
+       IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN },
+     { input_method::kChewingKeyboardTypeEten26,
+       IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN26 },
+     { input_method::kChewingKeyboardTypeDvorak,
+       IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DVORAK },
+     { input_method::kChewingKeyboardTypeDvorakHsu,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DVORAK_HSU },
-     { "dachen_26",
+     { input_method::kChewingKeyboardTypeDachen26,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DACHEN_26 },
-     { "hanyu", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HANYU }},
+     { input_method::kChewingKeyboardTypeHanyu,
+       IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HANYU }},
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE,
     PrefService::SYNCABLE_PREF,
   },
   { prefs::kLanguageChewingSelKeys,
-    "1234567890",
-    "selKeys",
-    {{ "1234567890",
+    input_method::kChewingSelKeys1234567890,
+    input_method::kChewingSelKeys,
+    {{ input_method::kChewingSelKeys1234567890,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_1234567890 },
-     { "asdfghjkl;",
+     { input_method::kChewingSelKeysAsdfghjkl_,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_ASDFGHJKLS },
-     { "asdfzxcv89",
+     { input_method::kChewingSelKeysAsdfzxcv89,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_ASDFZXCV89 },
-     { "asdfjkl789",
+     { input_method::kChewingSelKeysAsdfjkl789,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_ASDFJKL789 },
-     { "aoeu;qjkix",
+     { input_method::kChewingSelKeysAoeu_qjkix,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_AOEUSQJKIX },
-     { "aoeuhtnsid",
+     { input_method::kChewingSelKeysAoeuhtnsid,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_AOEUHTNSID },
-     { "aoeuidhtns",
+     { input_method::kChewingSelKeysAoeuidhtns,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_AOEUIDHTNS },
-     { "1234qweras",
+     { input_method::kChewingSelKeys1234qweras,
        IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_1234QWERAS }},
     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS,
     PrefService::SYNCABLE_PREF,
@@ -121,10 +129,12 @@ COMPILE_ASSERT(kNumChewingMultipleChoicePrefs ==
 
 const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType = {
   prefs::kLanguageChewingHsuSelKeyType,
-  1,
-  "hsuSelKeyType",
-  {{ 1, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_1 },
-   { 2, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_2 }},
+  input_method::kChewingHsuSelKeyType1,
+  input_method::kChewingHsuSelKeyType,
+  {{ input_method::kChewingHsuSelKeyType1,
+     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_1 },
+   { input_method::kChewingHsuSelKeyType2,
+     IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_2 }},
   IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE,
   PrefService::SYNCABLE_PREF,
 };
@@ -132,10 +142,7 @@ const LanguageMultipleChoicePreference<int>
kChewingHsuSelKeyType = {
 // ---------------------------------------------------------------------------
 // For Korean input method (ibus-mozc-hangul)
 // ---------------------------------------------------------------------------
-const char kHangulSectionName[] = "engine/Hangul";
-const char kHangulKeyboardConfigName[] = "HangulKeyboard";
 
-const char kHangulHanjaBindingKeysConfigName[] = "HanjaKeyBindings";
 // Mozc-hangul treats Hangul_Hanja key as hanja key event …
(message too large)

[commit-bot: I haz the power, 2013-01-02 16:53:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11573014/25001

[commit-bot: I haz the power, 2013-01-02 16:53:09]

Presubmit check for 11573014-25001 failed and returned exit status 1.


Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    chrome
    chrome/browser/chromeos

Presubmit checks took 1.3s to calculate.

[erikwright (departed), 2013-01-02 17:33:56]

TBR zelidrag for c/b/chromeos OWNERS. I mistakenly added zork@ before.

I think the changes in this directory are already sufficiently reviewed by zork@
and nona@ to TBR you.

[commit-bot: I haz the power, 2013-01-02 17:35:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11573014/25001

[commit-bot: I haz the power, 2013-01-02 19:23:39]

Change committed as 174829

[jochen (gone - plz use gerrit), 2013-01-06 20:00:26]

gypi lgtm