Revert 174829

> 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
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/11573014

TBR=erikwright@chromium.org
BUG=168022, 164375
Review URL: https://codereview.chromium.org/11740017

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

4 files changed, 12 insertions, 354 deletions

diff --git a/chrome/browser/chromeos/input_method/DEPS b/chrome/browser/chromeos/input_method/DEPS
index a1dc2dc..052dd54 100644
--- a/chrome/browser/chromeos/input_method/DEPS
+++ b/chrome/browser/chromeos/input_method/DEPS
@@ -13,4 +13,13 @@ specific_include_rules = {
     "+chrome/test",
     "+content/public",
   ],
+  # TODO(erikwright): Bring this list to zero.
+  #
+  # Do not add to the list of temporarily-allowed dependencies below,
+  # and please do not introduce more #includes of these files.
+  'input_method_manager_impl\.cc': [
+    # TODO(erikwright): Much/all of language_preferences can/should be decoupled
+    # from chrome/browser.
+    "!chrome/browser/chromeos/language_preferences.h"
+  ],
 }
diff --git a/chrome/browser/chromeos/input_method/input_method_constants.cc b/chrome/browser/chromeos/input_method/input_method_constants.cc
deleted file mode 100644
index 4a53856..0000000
--- a/chrome/browser/chromeos/input_method/input_method_constants.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/input_method/input_method_constants.h"
-
-namespace chromeos {
-namespace input_method {
-
-// ---------------------------------------------------------------------------
-// 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 char kChewingAutoShiftCur[] = "autoShiftCur";
-const char kChewingAddPhraseDirection[] = "addPhraseDirection";
-const char kChewingEasySymbolInput[] = "easySymbolInput";
-const char kChewingEscCleanAllBuf[] = "escCleanAllBuf";
-const char kChewingForceLowercaseEnglish[] = "forceLowercaseEnglish";
-const char kChewingPlainZhuyin[] = "plainZhuyin";
-const char kChewingPhraseChoiceRearward[] = "phraseChoiceRearward";
-const char kChewingSpaceAsSelection[] = "spaceAsSelection";
-const char kChewingMaxChiSymbolLen[] = "maxChiSymbolLen";
-const char kChewingCandPerPage[] = "candPerPage";
-const char kChewingKeyboardType[] = "KBType";
-const char kChewingKeyboardTypeDefault[] = "default";
-const char kChewingKeyboardTypeHsu[] = "hsu";
-const char kChewingKeyboardTypeIbm[] = "ibm";
-const char kChewingKeyboardTypeGinYieh[] = "gin_yieh";
-const char kChewingKeyboardTypeEten[] = "eten";
-const char kChewingKeyboardTypeEten26[] = "eten26";
-const char kChewingKeyboardTypeDvorak[] = "dvorak";
-const char kChewingKeyboardTypeDvorakHsu[] = "dvorak_hsu";
-const char kChewingKeyboardTypeDachen26[] = "dachen_26";
-const char kChewingKeyboardTypeHanyu[] = "hanyu";
-
-const char kChewingSelKeys[] = "selKeys";
-const char kChewingSelKeys1234567890[] = "1234567890";
-const char kChewingSelKeysAsdfghjkl_[] = "asdfghjkl;";
-const char kChewingSelKeysAsdfzxcv89[] = "asdfzxcv89";
-const char kChewingSelKeysAsdfjkl789[] = "asdfjkl789";
-const char kChewingSelKeysAoeu_qjkix[] = "aoeu;qjkix";
-const char kChewingSelKeysAoeuhtnsid[] = "aoeuhtnsid";
-const char kChewingSelKeysAoeuidhtns[] = "aoeuidhtns";
-const char kChewingSelKeys1234qweras[] = "1234qweras";
-
-const char kChewingHsuSelKeyType[] = "hsuSelKeyType";
-const int kChewingHsuSelKeyType1 = 1;
-const int kChewingHsuSelKeyType2 = 2;
-
-// ---------------------------------------------------------------------------
-// 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 even if it is not set.
-// We add Control+9 since F9 key is reserved by the window manager.
-// TODO(nona): Hanja keys are not configurable yet (and we're not sure if it
-// should.)
-const char kHangulHanjaBindingKeys[] = "F9,Ctrl 9";
-
-// We have to sync the |keyboard_id|s with those in libhangul.
-const char kHangulKeyboard2Set[] = "2";
-const char kHangulKeyboard3SetFinal[] = "3f";
-const char kHangulKeyboard3Set390[] = "39";
-const char kHangulKeyboard3SetNoShift[] = "3s";
-const char kHangulKeyboardRomaja[] = "ro";
-// We don't support "Sebeolsik 2 set" keyboard.
-
-// ---------------------------------------------------------------------------
-// For Simplified Chinese input method (ibus-mozc-pinyin)
-// ---------------------------------------------------------------------------
-const char kPinyinSectionName[] = "engine/Pinyin";
-
-// We have to sync the |ibus_config_name|s with those in
-// ibus-mozc-pinyin/files/languages/pinyin/unix/ibus/config_updater.cc.
-const char kPinyinCorrectPinyin[] = "CorrectPinyin";
-const char kPinyinFuzzyPinyin[] = "FuzzyPinyin";
-const char kPinyinShiftSelectCandidate[] = "ShiftSelectCandidate";
-const char kPinyinMinusEqualPage[] = "MinusEqualPage";
-const char kPinyinCommaPeriodPage[] = "CommaPeriodPage";
-const char kPinyinAutoCommit[] = "AutoCommit";
-const char kPinyinDoublePinyin[] = "DoublePinyin";
-const char kPinyinInitChinese[] = "InitChinese";
-const char kPinyinInitFull[] = "InitFull";
-const char kPinyinInitFullPunct[] = "InitFullPunct";
-const char kPinyinInitSimplifiedChinese[] = "InitSimplifiedChinese";
-// TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32
-// additional boolean prefs.)
-// TODO(yusukes): Support HalfWidthPuncts and IncompletePinyin prefs if needed.
-
-const char kPinyinDoublePinyinSchema[] = "DoublePinyinSchema";
-const int kPinyinDoublePinyinSchemaMspy = 0;
-const int kPinyinDoublePinyinSchemaZrm = 1;
-const int kPinyinDoublePinyinSchemaAbc = 2;
-const int kPinyinDoublePinyinSchemaZgpy = 3;
-const int kPinyinDoublePinyinSchemaPyjj = 4;
-const char kPinyinLookupTablePageSize[] = "LookupTablePageSize";
-
-// ---------------------------------------------------------------------------
-// For Japanese input method (ibus-mozc)
-// ---------------------------------------------------------------------------
-const char kMozcSectionName[] = "engine/Mozc";
-
-const char kMozcIncognitoMode[] = "incognito_mode";
-const char kMozcUseAutoImeTurnOff[] = "use_auto_ime_turn_off";
-const char kMozcUseHistorySuggest[] = "use_history_suggest";
-const char kMozcUseDictionarySuggest[] = "use_dictionary_suggest";
-
-const char kMozcPreeditMethod[] = "preedit_method";
-const char kMozcPreeditMethodRoman[] = "ROMAN";
-const char kMozcPreeditMethodKana[] = "KANA";
-
-const char kMozcSessionKeymap[] = "session_keymap";
-const char kMozcSessionKeymapAtok[] = "ATOK";
-const char kMozcSessionKeymapMsime[] = "MSIME";
-const char kMozcSessionKeymapKotoeri[] = "KOTOERI";
-
-const char kMozcPunctuationMethod[] = "punctuation_method";
-const char kMozcPunctuationMethodKutenTouten[] = "KUTEN_TOUTEN";
-const char kMozcPunctuationMethodCommaPeriod[] = "COMMA_PERIOD";
-const char kMozcPunctuationMethodKutenPeriod[] = "KUTEN_PERIOD";
-const char kMozcPunctuationMethodCommaTouten[] = "COMMA_TOUTEN";
-
-const char kMozcSymbolMethod[] = "symbol_method";
-const char kMozcSymbolMethodCornerBracketMiddleDot[] =
-    "CORNER_BRACKET_MIDDLE_DOT";
-const char kMozcSymbolMethodSquareBracketSlash[] = "SQUARE_BRACKET_SLASH";
-const char kMozcSymbolMethodCornerBracketSlash[] = "CORNER_BRACKET_SLASH";
-const char kMozcSymbolMethodSquareBracketMiddleDot[] =
-    "SQUARE_BRACKET_MIDDLE_DOT";
-
-const char kMozcSpaceCharacterForm[] = "space_character_form";
-const char kMozcSpaceCharacterFormFundamentalInputMode[] =
-    "FUNDAMENTAL_INPUT_MODE";
-const char kMozcSpaceCharacterFormFundamentalFullWidth[] =
-    "FUNDAMENTAL_FULL_WIDTH";
-const char kMozcSpaceCharacterFormFundamentalHalfWidth[] =
-    "FUNDAMENTAL_HALF_WIDTH";
-
-const char kMozcHistoryLearningLevel[] = "history_learning_level";
-const char kMozcHistoryLearningLevelDefaultHistory[] = "DEFAULT_HISTORY";
-const char kMozcHistoryLearningLevelReadOnly[] = "READ_ONLY";
-const char kMozcHistoryLearningLevelNoHistory[] = "NO_HISTORY";
-
-const char kMozcSelectionShortcut[] = "selection_shortcut";
-const char kMozcSelectionShortcutNoShortcut[] = "NO_SHORTCUT";
-const char kMozcSelectionShortcutShortcut123456789[] = "SHORTCUT_123456789";
-const char kMozcSelectionShortcutShortcutAsdfghjkl[] = "SHORTCUT_ASDFGHJKL";
-
-
-const char kMozcShiftKeyModeSwitch[] = "shift_key_mode_switch";
-const char kMozcShiftKeyModeSwitchOff[] = "OFF";
-const char kMozcShiftKeyModeSwitchAsciiInputMode[] = "ASCII_INPUT_MODE";
-const char kMozcShiftKeyModeSwitchKatakanaInputMode[] = "KATAKANA_INPUT_MODE";
-
-const char kMozcNumpadCharacterForm[] = "numpad_character_form";
-const char kMozcNumpadCharacterFormNumpadInputMode[] = "NUMPAD_INPUT_MODE";
-const char kMozcNumpadCharacterFormNumpadFullWidth[] = "NUMPAD_FULL_WIDTH";
-const char kMozcNumpadCharacterFormNumpadHalfWidth[] = "NUMPAD_HALF_WIDTH";
-const char kMozcNumpadCharacterFormNumpadDirectInput[] = "NUMPAD_DIRECT_INPUT";
-
-const char kMozcSuggestionsSize[] = "suggestions_size";
-
-}  // namespace input_method
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/input_method/input_method_constants.h b/chrome/browser/chromeos/input_method/input_method_constants.h
deleted file mode 100644
index c86e570..0000000
--- a/chrome/browser/chromeos/input_method/input_method_constants.h
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONSTANTS_H_
-#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONSTANTS_H_
-
-// This file defines configuration parameter names for ibus.
-namespace chromeos {
-namespace input_method {
-
-// ---------------------------------------------------------------------------
-// For ibus-daemon
-// ---------------------------------------------------------------------------
-extern const char kGeneralSectionName[];
-extern const char kPreloadEnginesConfigName[];
-
-// ---------------------------------------------------------------------------
-// For Traditional Chinese input method (ibus-mozc-chewing)
-// ---------------------------------------------------------------------------
-extern const char kChewingSectionName[];
-
-// We have to sync the |ibus_config_name|s with those in
-// ibus-chewing/files/src/Config.cc.
-extern const char kChewingAutoShiftCur[];
-extern const char kChewingAddPhraseDirection[];
-extern const char kChewingEasySymbolInput[];
-extern const char kChewingEscCleanAllBuf[];
-extern const char kChewingForceLowercaseEnglish[];
-extern const char kChewingPlainZhuyin[];
-extern const char kChewingPhraseChoiceRearward[];
-extern const char kChewingSpaceAsSelection[];
-extern const char kChewingMaxChiSymbolLen[];
-extern const char kChewingCandPerPage[];
-extern const char kChewingKeyboardType[];
-extern const char kChewingKeyboardTypeDefault[];
-extern const char kChewingKeyboardTypeHsu[];
-extern const char kChewingKeyboardTypeIbm[];
-extern const char kChewingKeyboardTypeGinYieh[];
-extern const char kChewingKeyboardTypeEten[];
-extern const char kChewingKeyboardTypeEten26[];
-extern const char kChewingKeyboardTypeDvorak[];
-extern const char kChewingKeyboardTypeDvorakHsu[];
-extern const char kChewingKeyboardTypeDachen26[];
-extern const char kChewingKeyboardTypeHanyu[];
-
-extern const char kChewingSelKeys[];
-extern const char kChewingSelKeys1234567890[];
-extern const char kChewingSelKeysAsdfghjkl_[];
-extern const char kChewingSelKeysAsdfzxcv89[];
-extern const char kChewingSelKeysAsdfjkl789[];
-extern const char kChewingSelKeysAoeu_qjkix[];
-extern const char kChewingSelKeysAoeuhtnsid[];
-extern const char kChewingSelKeysAoeuidhtns[];
-extern const char kChewingSelKeys1234qweras[];
-
-extern const char kChewingHsuSelKeyType[];
-extern const int kChewingHsuSelKeyType1;
-extern const int kChewingHsuSelKeyType2;
-
-// ---------------------------------------------------------------------------
-// For Korean input method (ibus-mozc-hangul)
-// ---------------------------------------------------------------------------
-extern const char kHangulSectionName[];
-extern const char kHangulKeyboardConfigName[];
-
-extern const char kHangulHanjaBindingKeysConfigName[];
-// Mozc-hangul treats Hangul_Hanja key as hanja key event even if it is not set.
-// We add Control+9 since F9 key is reserved by the window manager.
-// TODO(nona): Hanja keys are not configurable yet (and we're not sure if it
-// should.)
-extern const char kHangulHanjaBindingKeys[];
-
-// We have to sync the |keyboard_id|s with those in libhangul.
-extern const char kHangulKeyboard2Set[];
-extern const char kHangulKeyboard3SetFinal[];
-extern const char kHangulKeyboard3Set390[];
-extern const char kHangulKeyboard3SetNoShift[];
-extern const char kHangulKeyboardRomaja[];
-// We don't support "Sebeolsik 2 set" keyboard.
-
-// ---------------------------------------------------------------------------
-// For Simplified Chinese input method (ibus-mozc-pinyin)
-// ---------------------------------------------------------------------------
-extern const char kPinyinSectionName[];
-
-// We have to sync the |ibus_config_name|s with those in
-// ibus-mozc-pinyin/files/languages/pinyin/unix/ibus/config_updater.cc.
-extern const char kPinyinCorrectPinyin[];
-extern const char kPinyinFuzzyPinyin[];
-extern const char kPinyinShiftSelectCandidate[];
-extern const char kPinyinMinusEqualPage[];
-extern const char kPinyinCommaPeriodPage[];
-extern const char kPinyinAutoCommit[];
-extern const char kPinyinDoublePinyin[];
-extern const char kPinyinInitChinese[];
-extern const char kPinyinInitFull[];
-extern const char kPinyinInitFullPunct[];
-extern const char kPinyinInitSimplifiedChinese[];
-// TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32
-// additional boolean prefs.)
-// TODO(yusukes): Support HalfWidthPuncts and IncompletePinyin prefs if needed.
-
-extern const char kPinyinDoublePinyinSchema[];
-extern const int kPinyinDoublePinyinSchemaMspy;
-extern const int kPinyinDoublePinyinSchemaZrm;
-extern const int kPinyinDoublePinyinSchemaAbc;
-extern const int kPinyinDoublePinyinSchemaZgpy;
-extern const int kPinyinDoublePinyinSchemaPyjj;
-extern const char kPinyinLookupTablePageSize[];
-
-// ---------------------------------------------------------------------------
-// For Japanese input method (ibus-mozc)
-// ---------------------------------------------------------------------------
-extern const char kMozcSectionName[];
-
-extern const char kMozcIncognitoMode[];
-extern const char kMozcUseAutoImeTurnOff[];
-extern const char kMozcUseHistorySuggest[];
-extern const char kMozcUseDictionarySuggest[];
-
-extern const char kMozcPreeditMethod[];
-extern const char kMozcPreeditMethodRoman[];
-extern const char kMozcPreeditMethodKana[];
-
-extern const char kMozcSessionKeymap[];
-extern const char kMozcSessionKeymapAtok[];
-extern const char kMozcSessionKeymapMsime[];
-extern const char kMozcSessionKeymapKotoeri[];
-
-extern const char kMozcPunctuationMethod[];
-extern const char kMozcPunctuationMethodKutenTouten[];
-extern const char kMozcPunctuationMethodCommaPeriod[];
-extern const char kMozcPunctuationMethodKutenPeriod[];
-extern const char kMozcPunctuationMethodCommaTouten[];
-
-extern const char kMozcSymbolMethod[];
-extern const char kMozcSymbolMethodCornerBracketMiddleDot[];
-extern const char kMozcSymbolMethodSquareBracketSlash[];
-extern const char kMozcSymbolMethodCornerBracketSlash[];
-extern const char kMozcSymbolMethodSquareBracketMiddleDot[];
-
-extern const char kMozcSpaceCharacterForm[];
-extern const char kMozcSpaceCharacterFormFundamentalInputMode[];
-extern const char kMozcSpaceCharacterFormFundamentalFullWidth[];
-extern const char kMozcSpaceCharacterFormFundamentalHalfWidth[];
-
-extern const char kMozcHistoryLearningLevel[];
-extern const char kMozcHistoryLearningLevelDefaultHistory[];
-extern const char kMozcHistoryLearningLevelReadOnly[];
-extern const char kMozcHistoryLearningLevelNoHistory[];
-
-extern const char kMozcSelectionShortcut[];
-extern const char kMozcSelectionShortcutNoShortcut[];
-extern const char kMozcSelectionShortcutShortcut123456789[];
-extern const char kMozcSelectionShortcutShortcutAsdfghjkl[];
-
-
-extern const char kMozcShiftKeyModeSwitch[];
-extern const char kMozcShiftKeyModeSwitchOff[];
-extern const char kMozcShiftKeyModeSwitchAsciiInputMode[];
-extern const char kMozcShiftKeyModeSwitchKatakanaInputMode[];
-
-extern const char kMozcNumpadCharacterForm[];
-extern const char kMozcNumpadCharacterFormNumpadInputMode[];
-extern const char kMozcNumpadCharacterFormNumpadFullWidth[];
-extern const char kMozcNumpadCharacterFormNumpadHalfWidth[];
-extern const char kMozcNumpadCharacterFormNumpadDirectInput[];
-
-extern const char kMozcSuggestionsSize[];
-
-}  // input_method
-}  // chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONSTANTS_H_
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 2692c2d..e4c26ec 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
@@ -12,10 +12,10 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
-#include "chrome/browser/chromeos/input_method/input_method_constants.h"
 #include "chrome/browser/chromeos/input_method/input_method_delegate.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
+#include "chrome/browser/chromeos/language_preferences.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "unicode/uloc.h"
 
@@ -219,8 +219,8 @@ bool InputMethodManagerImpl::SetInputMethodConfig(
     const std::string& section,
     const std::string& config_name,
     const InputMethodConfigValue& value) {
-  DCHECK(section != input_method::kGeneralSectionName ||
-         config_name != input_method::kPreloadEnginesConfigName);
+  DCHECK(section != language_prefs::kGeneralSectionName ||
+         config_name != language_prefs::kPreloadEnginesConfigName);
 
   if (state_ == STATE_TERMINATING)
     return false;